[Fedora-directory-commits] adminserver/admserv/console/src/com/netscape/management/admserv/panel UGDirectoryConfigPanel.java, 1.3, 1.4 panel.properties, 1.3, 1.4

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console/src/com/netscape/management/admserv/panel

Modified Files:
	UGDirectoryConfigPanel.java panel.properties 
Log Message:
171942 – Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.



Index: UGDirectoryConfigPanel.java
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/panel/UGDirectoryConfigPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UGDirectoryConfigPanel.java	18 Aug 2005 19:02:32 -0000	1.3
+++ UGDirectoryConfigPanel.java	28 Oct 2005 22:43:56 -0000	1.4
@@ -338,16 +338,6 @@
         boolean ssl = _cbSSL.isSelected();
         int portNum = -1;
 
-        // 4.0 Servers do not support failover. Make sure that
-        // a single host:port pair is specified
-        if (host.indexOf(" ") != -1) { // space is the list entry delimiter 
-            ConsoleInfo consoleInfo = ((AdminConfigData)_configData).getConsoleInfo();
-            String version = (String) consoleInfo.get("SIE_VERSION");
-            if (version.equals("4.0")) {
-                String msg = _resource.getString("ldapds","FailoverSupport");
-                throw new ValidationException("",  msg);
-            }    
-        }    
         try {
             LDAPUtil.validateLDAPParams(host, portNum, ssl, bindDN,
                     bindPWD, baseDN);


Index: panel.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/panel/panel.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- panel.properties	18 Aug 2005 19:02:32 -0000	1.3
+++ panel.properties	28 Oct 2005 22:43:56 -0000	1.4
@@ -146,7 +146,6 @@
 ldapds-ChangedInfo=You must shutdown and restart your Administration Server and all the\nservers in the Server Group for directory service changes to take effect.
 ldapds-WarnMigrate=If you are switching to a new configuration directory, you must first migrate your server configuration from the current directory to the new one. See Directory Server documentation for more information. 
 ldapds-WarnCert=If you choose to use LDAP with SSL, you must first install a Trusted CA certificate for each server involved. Use the Certificate Setup Wizard to install a Trusted CA certificate.
-ldapds-FailoverSupport=Administration Server 4.0 does not support failover.\nPlease enter a single host:port value
 
 #
 # Network panel