[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java, 1.1.1.1, 1.2 about.properties, 1.1.1.1, 1.2 dirserv.properties, 1.1.1.1, 1.2

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298/src/com/netscape/admin/dirserv

Modified Files:
	DSAdmin.java about.properties dirserv.properties 
Log Message:
171941 - Adjusted the version number and branding.  I had to modify the checkVersion method to deal with running in Console 1.0.  I also cleaned up references to consolesdk in the Ant build files.  They should be console instead since we dropped the consolesdk naming.  The external and internal imports files were adjusted to pick up the new 1.0 Console component.


Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSAdmin.java	18 Jul 2005 00:55:34 -0000	1.1.1.1
+++ DSAdmin.java	28 Oct 2005 18:01:34 -0000	1.2
@@ -1231,25 +1231,19 @@
 	private boolean checkVersion(ConsoleInfo info) {
 		String version = null;
 		JFrame frame = UtilConsoleGlobals.getActivatedFrame();
-		try {
-			version = VersionInfo.getVersionNumber();
-		}
-		// If the class is not found then we are running in 4.0 environment
-		catch (Exception e) {
-			DSUtil.showErrorDialog(frame, "neednewconsole", "4.0");
-			return false;
-		}
+		version = VersionInfo.getVersionNumber();
 
 		try {
 			Float f = new Float(version);
-			// this version of the console is compatible with any kingpin
-			// console version greater than 4.0 e.g. 4.1, 4.2, 5.0, etc.
-			return (f != null) && (f.floatValue() > 4.0);
+			// Check if the console meets the minimum version requirement
+			if ((f != null) && (f.floatValue() > MINIMUM_VERSION)) {
+				return true;
+			} else {
+				DSUtil.showErrorDialog(frame, "neednewconsole", version);
+			}
 		} catch (Exception e) { // could not parse version as float
 		}
 
-		DSUtil.showErrorDialog(frame, "neednewconsole", version);
-
 		return false;
 	}
 
@@ -1274,6 +1268,9 @@
 	static public int SECURITY_DISABLE = 1;
 	static public int SECURITY_ENABLE  = 2;
 
+	// Minimum required console version
+	private static final float MINIMUM_VERSION = 1.0f;
+
 	// Icon for the console
 	private static final String _imageName = "directory.gif";
 	private static final String AUTH_ICON = "face.gif";


Index: about.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/about.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- about.properties	18 Jul 2005 00:55:43 -0000	1.1.1.1
+++ about.properties	28 Oct 2005 18:01:34 -0000	1.2
@@ -19,7 +19,7 @@
 #
 # Strings and logos used by the DSAboutDialog
 
-aboutDialog-dialogTitle=Fedora Directory Server 7.1
+aboutDialog-dialogTitle=Fedora Directory Server 1.0
 aboutDialog-productLogo=com/netscape/management/client/images/logo32.gif
 aboutDialog-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
 aboutDialog-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.


Index: dirserv.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dirserv.properties	18 Jul 2005 00:55:45 -0000	1.1.1.1
+++ dirserv.properties	28 Oct 2005 18:01:34 -0000	1.2
@@ -164,9 +164,9 @@
 #
 dialog-configtitle=Fedora Directory Server
 dsAdmin-title=Fedora Directory Server
-dsAdmin-version=Version 7.1
+dsAdmin-version=Version 1.0
 dsAdmin-nsServerPort=Port
-dsAdmin-framework-description=Fedora Directory Server Console 7.1
+dsAdmin-framework-description=Fedora Directory Server Console 1.0
 dsAdmin-remove-server-cgi-failed=ds_remove failure
 
 #