Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440/src/com/netscape/admin/dirserv/panel/replication
Modified Files: LegacySupplierSettingPanel.java ReplicationAgreement.java SupplierSettingPanel.java Log Message: Resolves: 246513 Summary: Removed server root concept from Directory Console.
Index: LegacySupplierSettingPanel.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/LegacySupplierSettingPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- LegacySupplierSettingPanel.java 18 Jul 2005 00:56:07 -0000 1.1.1.1 +++ LegacySupplierSettingPanel.java 2 Jul 2007 19:44:09 -0000 1.2 @@ -396,11 +396,7 @@ }
private void SetDefaultDir () { - String dir = getInstanceDirectory () + "/" + DEFAULT_DBDIR; - - /* replace all \ with / in the path */ - dir = dir.replace('\', '/'); - + String dir = DSUtil.getDefaultChangelogPath( getModel().getServerInfo() ); _dbText.setText(dir); }
@@ -892,7 +888,6 @@ private static int DEFAULT_AGE_UNIT = DAY_AGE_UNIT; //day
private static final String REMOVE = "remove"; - private static final String DEFAULT_DBDIR = "changelogdb"; private static final String DEFAULT_SUFFIX = "cn=changelog"; private static final String CONFIG_DN = "cn=config"; private static final String PRIVATE_SUFFIX_ATTR = "nsslapd-privatenamespaces";
Index: ReplicationAgreement.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/ReplicationAgreement.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ReplicationAgreement.java 18 Jul 2005 00:56:09 -0000 1.1.1.1 +++ ReplicationAgreement.java 2 Jul 2007 19:44:09 -0000 1.2 @@ -873,7 +873,7 @@ if (backendName == null) { return false; } - String dnDB = "cn="+backendName+"," + DSUtil.LDBM_CONFIG_BASE_DN; + String dnDB = "cn="+backendName+"," + DSUtil.LDBM_BASE_DN; /* Get read-only state of database */ try { @@ -921,7 +921,7 @@ if (backendName == null) { return false; } - String dnDB = "cn="+backendName+"," + DSUtil.LDBM_CONFIG_BASE_DN; + String dnDB = "cn="+backendName+"," + DSUtil.LDBM_BASE_DN; /* Get read-only state of database */ try { wasReadOnly = ReadOnly.isReadOnly( model.getServerInfo(), dnDB );
Index: SupplierSettingPanel.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/SupplierSettingPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SupplierSettingPanel.java 18 Jul 2005 00:56:10 -0000 1.1.1.1 +++ SupplierSettingPanel.java 2 Jul 2007 19:44:09 -0000 1.2 @@ -291,11 +291,7 @@ }
private void SetDefaultDir () { - String dir = getInstanceDirectory () + "/" + DEFAULT_DBDIR; - - /* replace all \ with / in the path */ - dir = dir.replace('\', '/'); - + String dir = DSUtil.getDefaultChangelogPath( _model.getServerInfo() ); _dbText.setText(dir); }
@@ -953,7 +949,6 @@ private static int DEFAULT_AGE_UNIT = DAY_AGE_UNIT; //day
private static final String REMOVE = "remove"; - private static final String DEFAULT_DBDIR = "changelogdb";
private static ResourceSet _resource = new ResourceSet("com.netscape.admin.dirserv.panel.replication.replication");