3:32 p.m.
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory
cvs-int.fedora.redhat.com:/tmp/cvs-serv1397/src/com/netscape/management/client/topology
Modified Files:
AbstractServerObject.java AdminGroupNode.java
TopologyInitializer.java topology.properties
Removed Files:
MergeConfigDialog.java
Log Message:
Resolves: 246270
Summary: Remove server root concept from Console.
Index: AbstractServerObject.java
===================================================================
RCS file:
/cvs/dirsec/console/src/com/netscape/management/client/topology/AbstractServerObject.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- AbstractServerObject.java 18 Jul 2005 00:34:18 -0000 1.1.1.1
+++ AbstractServerObject.java 29 Jun 2007 20:32:29 -0000 1.2
@@ -67,7 +67,7 @@
// attributes of objectclass netscapeServer
static String _serverDataKey[] = new String[]{ "cn",
"serverProductName",
"description", "administratorContactInfo",
//"serverVersionNumber",
- "installationTimeStamp", "serverRoot",
"serverHostName", };
+ "installationTimeStamp", "serverHostName", };
// attributes of objectclass nsApplication
static String _productDataKey[] = new String[]{ "nsProductName",
//"description",
@@ -86,7 +86,7 @@
static String _displayDataKey[] = new String[]{ "serverProductName",
"description", //"serverVersionNumber",
- "installationTimeStamp", "serverRoot",
"nsProductName",
+ "installationTimeStamp", "nsProductName",
"nsVendor", "nsProductVersion", "nsBuildNumber",
"nsRevisionNumber",
"nsBuildSecurity", };
Index: AdminGroupNode.java
===================================================================
RCS file:
/cvs/dirsec/console/src/com/netscape/management/client/topology/AdminGroupNode.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- AdminGroupNode.java 18 Jul 2005 00:34:18 -0000 1.1.1.1
+++ AdminGroupNode.java 29 Jun 2007 20:32:29 -0000 1.2
@@ -43,7 +43,6 @@
*/
public class AdminGroupNode extends ServerLocNode implements IMenuInfo,
INodeInfo {
- private static final String MENU_MERGE = "MERGE";
private static final String MENU_OBJECT_CREATE_CATEGORY =
"OBJECT_CREATE_CATEGORY";
private static final String MENU_CONTEXT_CREATE_CATEGORY =
"CONTEXT_CREATE_CATEGORY";
@@ -52,7 +51,6 @@
private InstalledProduct[]_installedProducts;
private static RemoteImage _icon = null;
- private static ServerRootPromptDialog _serverRootPrompt = null;
private static ProductSelectionDialog _serverSelection = null;
private static ResourceSet _resource;
@@ -297,7 +295,6 @@
rpm.fireDisableMenuItem(viewInstance,
MENU_CONTEXT_CREATE_CATEGORY);
}
- rpm.fireEnableMenuItem(viewInstance, MENU_MERGE);
}
@@ -475,16 +472,12 @@
*/
public IMenuItem[] getMenuItems(String category) {
if (category.equals(ResourcePage.MENU_OBJECT)) {
- return new IMenuItem[]{ new MenuItemText(MENU_MERGE,
- _resource.getString("menu", "MergeConfig"),
"",
- true), new MenuItemCategory(
+ return new IMenuItem[]{ new MenuItemCategory(
MENU_OBJECT_CREATE_CATEGORY,
_resource.getString("menu", "CreateServer"),
_enableCreateMenuCategory)};
} else if (category.equals(ResourcePage.MENU_CONTEXT)) {
- return new IMenuItem[]{ new MenuItemText(MENU_MERGE,
- _resource.getString("menu", "MergeConfig"),
"",
- true), new MenuItemCategory(
+ return new IMenuItem[]{ new MenuItemCategory(
MENU_CONTEXT_CREATE_CATEGORY,
_resource.getString("menu", "CreateServer"),
_enableCreateMenuCategory)};
@@ -525,50 +518,43 @@
* @param item menu item which is selected
*/
public void actionMenuSelected(IPage viewInstance, IMenuItem item) {
- if (item.getID().equals(MENU_MERGE)) {
- MergeConfigDialog d =
- new MergeConfigDialog(getDN(), _consoleInfo, this,
- viewInstance);
- d.show();
- } else {
- // Check if create a new server instance was selected.
- if (_installedProducts != null) {
- for (int i = 0; i < _installedProducts.length; i++) {
- if (item.getID().equals(
- _installedProducts[i].getNickname())) {
- Class c = ClassLoaderUtil.getClass(_consoleInfo,
- _installedProducts[i]
- .getCreationClassName());
- if (c != null) {
- try {
- IProductObject productHandle =
- (IProductObject) c.newInstance();
- productHandle.initialize(
- (ConsoleInfo)_consoleInfo.clone());
- CreateThread thread =
- new CreateThread(_consoleInfo,
- viewInstance, getDN(),
- productHandle, _resource);
- thread.start();
- } catch (Exception e) {
- SuiOptionPane.showMessageDialog(
- _consoleInfo.getFrame(),
- MessageFormat.format(
-
_resource.getString("ServerRootPromptDialog",
- "couldNotInstantiate"),
- new Object[]{c.getName(), e}),
-
_resource.getString("ServerRootPromptDialog",
- "CreateTitle"),
- SuiOptionPane.ERROR_MESSAGE);
- ModalDialogUtil.sleep();
- ModalDialogUtil.raise(
- viewInstance.getFramework().
- getJFrame());
- return;
- }
+ // Check if create a new server instance was selected.
+ if (_installedProducts != null) {
+ for (int i = 0; i < _installedProducts.length; i++) {
+ if (item.getID().equals(
+ _installedProducts[i].getNickname())) {
+ Class c = ClassLoaderUtil.getClass(_consoleInfo,
+ _installedProducts[i]
+ .getCreationClassName());
+ if (c != null) {
+ try {
+ IProductObject productHandle =
+ (IProductObject) c.newInstance();
+ productHandle.initialize(
+ (ConsoleInfo)_consoleInfo.clone());
+ CreateThread thread =
+ new CreateThread(_consoleInfo,
+ viewInstance, getDN(),
+ productHandle, _resource);
+ thread.start();
+ } catch (Exception e) {
+ SuiOptionPane.showMessageDialog(
+ _consoleInfo.getFrame(),
+ MessageFormat.format(
+ _resource.getString("ServerPromptDialog",
+ "couldNotInstantiate"),
+ new Object[]{c.getName(), e}),
+ _resource.getString("ServerPromptDialog",
+ "CreateTitle"),
+ SuiOptionPane.ERROR_MESSAGE);
+ ModalDialogUtil.sleep();
+ ModalDialogUtil.raise(
+ viewInstance.getFramework().
+ getJFrame());
+ return;
}
- break; // Only one instance can be created at a time...
}
+ break; // Only one instance can be created at a time...
}
}
}
Index: TopologyInitializer.java
===================================================================
RCS file:
/cvs/dirsec/console/src/com/netscape/management/client/topology/TopologyInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TopologyInitializer.java 13 Jun 2007 20:33:11 -0000 1.2
+++ TopologyInitializer.java 29 Jun 2007 20:32:29 -0000 1.3
@@ -62,7 +62,7 @@
consoleInfo = info;
- setFrameTitle(new
ResourceSet("com.netscape.management.client.console.console").getString("console",
"title")); // not localized because it is product name
+ setFrameTitle(new
ResourceSet("com.netscape.management.client.theme.theme").getString("console",
"title")); // not localized because it is product name
setMinimizedImage( new
RemoteImage("com/netscape/management/client/theme/images/logo16.gif").getImage());
setBannerImage( new
RemoteImage("com/netscape/management/client/theme/images/ConsoleBanner.gif").getImage());
Index: topology.properties
===================================================================
RCS file:
/cvs/dirsec/console/src/com/netscape/management/client/topology/topology.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- topology.properties 26 Oct 2005 23:16:23 -0000 1.2
+++ topology.properties 29 Jun 2007 20:32:29 -0000 1.3
@@ -46,13 +46,11 @@
menu-CloneServer=Clone Server Config...
menu-Customize=Customize...
menu-LicenseTracking=&Track Licenses
-menu-MergeConfig=Merge Config...
menu-refresh=Re&fresh
menu-ChangeDirectory=C&hange Directory...
menu-Security=Security
menu-manageCert=&Manage Certificates
menu-migrateKeyCert=&Migrate Certificate data from...
-menu-MergeConfig=M&erge Configuration...
menu-open=&Open
menuCategory-User=&User
menu-CreateButton=&Create
@@ -209,26 +207,9 @@
ProductSelectionDialog-CreateHelpToken=topology-productselectiondialog-create
topology-psd-create=admin
-KeyCertMigrationDialog-Title=Migrate keys and certificates
-KeyCertMigrationDialog-from=Migrate key and certificate from:
-KeyCertMigrationDialog-oldServerRoot=Server root:
-KeyCertMigrationDialog-alias=Alias:
-KeyCertMigrationDialog-oldServerVer=Server version:
-KeyCertMigrationDialog-to=Migrate key and certificate to:
-KeyCertMigrationDialog-sie=Server ID:
-KeyCertMigrationDialog-pwd=Password:
-KeyCertMigrationDialog-fail=Key and certificate migration fail
-topology-kcmd=admin
-
-ServerRootPromptDialog-Title=Migrate Server Configuration
-ServerRootPromptDialog-CreateTitle=Create Server Instance
-ServerRootPromptDialog-okayToOverwrite=Is it okay to overwrite the existing SIE during
the migration of {0}?
-ServerRootPromptDialog-couldNotInstantiate=Could not instantiate class: {0}\n\nException:
{1}
-ServerRootPromptDialog-Prompt=Specify the server root path to migrate from.
-ServerRootPromptDialog-PromptDetail=** The server root must be accessible to the
Administration Server.
-ServerRootPromptDialog-TextFieldLabel=Directory:
-ServerRootPromptDialog-FindButtonLabel=Find Servers
-topology-srpd=admin
+ServerPromptDialog-CreateTitle=Create Server Instance
+ServerPromptDialog-couldNotInstantiate=Could not instantiate class: {0}\n\nException:
{1}
+topology-spd=admin
OUPickerDialog-Title=Select Organizational Unit
OUPickerDialog-Prompt=Select the directory subtree in which to create the new entry:
@@ -282,7 +263,6 @@
#
ServerObject-nsAdminGroupName=Group name
ServerObject-description=Description
-ServerObject-serverRoot=Server root
ServerObject-serverProductName=Server name
ServerObject-serverVersionNumber=Version
ServerObject-installationTimeStamp=Installation date
@@ -305,17 +285,6 @@
NewDomain-ownerDN=Owner DN:
topology-NewDomain=admin
-MergeConfig-title=Merge Configuration Directory Server Information
-MergeConfig-MergeWarning=Warning: Be sure to back up your Destination Config DS before
continuing!
-MergeConfig-DestDomain=Destination Domain:
-MergeConfig-DestHost=Destination LDAP Host:
-MergeConfig-DestPort=Destination LDAP Port:
-MergeConfig-DestBindDN=Destination LDAP Bind DN:
-MergeConfig-DestBindPW=Destination LDAP Bind Password:
-MergeConfig-Success=All configuration data has been merged and the server instances now
use the destination Configuration Directory Server.\nPlease restart the Admin Server and
Console for changes to take effect.
-MergeConfig-UpdateFailure=Error: At least one server's CGI failed while updating its
local config data.
-topology-MergeConfig=admin
-
customview-EditView=Edit View
customview-DefaultView=Default View
customview-RemoveView= &Remove
--- MergeConfigDialog.java DELETED ---