[Fedora-directory-commits] console/src/com/netscape/management/client/topology/customview CustomView.java, 1.3, 1.4
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology/customview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241/src/com/netscape/management/client/topology/customview
Modified Files:
CustomView.java
Log Message:
Resolves: 246270
Summary: Parameterized version number so it's only defined in one place.
Index: CustomView.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/customview/CustomView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CustomView.java 29 Jun 2007 20:32:29 -0000 1.3
+++ CustomView.java 2 Jul 2007 18:49:28 -0000 1.4
@@ -472,7 +472,8 @@
LDAPSearchResults result = null;
try {
result = _ldc.search(url.getDN().trim(), url.getScope(),
- url.getFilter().trim(), new String[] {"1.1.0"}, false);
+ url.getFilter().trim(),
+ new String[] {VersionInfo.getVersionNumber()}, false);
while (result != null && result.hasMoreElements()) {
LDAPEntry rscEntry = (LDAPEntry) result.next();
ResourceObject rscObj = getTopologyResource(rscEntry.getDN());
16 years, 9 months
[Fedora-directory-commits] console/src/com/netscape/management/client/theme theme.properties, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/theme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241/src/com/netscape/management/client/theme
Modified Files:
theme.properties
Log Message:
Resolves: 246270
Summary: Parameterized version number so it's only defined in one place.
Index: theme.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- theme.properties 29 Jun 2007 20:32:28 -0000 1.2
+++ theme.properties 2 Jul 2007 18:49:25 -0000 1.3
@@ -21,9 +21,9 @@
console-title=Fedora Management Console
console-useragent=Fedora-Management-Console
login-title=Fedora Management Console Login
-banner-console=Fedora Management Console 1.1
+banner-console=Fedora Management Console
-defaultAbout-dialogTitle=Fedora Management Console 1.1
+defaultAbout-dialogTitle=Fedora Management Console
defaultAbout-productLogo=com/netscape/management/client/theme/images/logo32.gif
defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
16 years, 9 months
[Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.9, 1.10 VersionInfo.java, 1.3, 1.4 console.properties, 1.7, 1.8 genverinfo.sh, 1.3, 1.4
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241/src/com/netscape/management/client/console
Modified Files:
Console.java VersionInfo.java console.properties genverinfo.sh
Log Message:
Resolves: 246270
Summary: Parameterized version number so it's only defined in one place.
Index: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Console.java 29 Jun 2007 20:32:28 -0000 1.9
+++ Console.java 2 Jul 2007 18:49:24 -0000 1.10
@@ -56,8 +56,8 @@
// preference information
//
public static final String IDENTIFIER = "Console";
- public static final String VERSION = "1.1.0";
- public static final String MAJOR_VERSION = "1.1";
+ public static final String VERSION = VersionInfo.getVersionNumber();
+ public static final String MAJOR_VERSION = VersionInfo.getMajorVersionNumber();
public static final String PREFERENCES_LOGIN =
IDENTIFIER + "." + VERSION + ".Login.preferences";
@@ -1559,8 +1559,8 @@
Debug.println(0,
_resource_theme.getString("console","useragent")+"/" +
- _resource.getString("console","displayVersion") +
- " B" + VersionInfo.getBuildNumber());
+ VersionInfo.getVersionNumber() + " B" +
+ VersionInfo.getBuildNumber());
if (opt.hasOption('x')) {
String extraParam = opt.getOptionParam('x');
Index: VersionInfo.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/VersionInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VersionInfo.java 24 Mar 2006 19:05:37 -0000 1.3
+++ VersionInfo.java 2 Jul 2007 18:49:24 -0000 1.4
@@ -37,6 +37,15 @@
* @return Console Version Number
*/
public static String getVersionNumber() {
+ return _resource.getString("console","versionNumber");
+ }
+
+ /**
+ * Returns major version number for the Console.
+ *
+ * @return Console Major Version Number
+ */
+ public static String getMajorVersionNumber() {
return _resource.getString("console","majorVersionNumber");
}
Index: console.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- console.properties 29 Jun 2007 20:32:28 -0000 1.7
+++ console.properties 2 Jul 2007 18:49:24 -0000 1.8
@@ -17,14 +17,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
#
-#console-title=Fedora Management Console
-#console-useragent=Fedora-Management-Console
-console-displayVersion=1.1
login-username=User ID:
login-password=Password:
login-url=Administration URL:
-#login-title=Fedora Management Console Login
login-copyright=Copyright (C) Red Hat, Inc.
login-help=manual/en/console/help/login.htm
login-passwordDialogTitle=Bind Password
Index: genverinfo.sh
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/genverinfo.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- genverinfo.sh 24 Mar 2006 19:05:38 -0000 1.3
+++ genverinfo.sh 2 Jul 2007 18:49:24 -0000 1.4
@@ -34,6 +34,6 @@
fi
echo console-versionNumber=$2 > $1
-echo console-majorVersionNumber=$3 > $1
+echo console-majorVersionNumber=$3 >> $1
bld=`cat $4`
echo console-buildNumber=`eval eval echo $bld` >> $1
16 years, 9 months
[Fedora-directory-commits] console/src/com/netscape/management/client Framework.java, 1.3, 1.4 FrameworkInitializer.java, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241/src/com/netscape/management/client
Modified Files:
Framework.java FrameworkInitializer.java
Log Message:
Resolves: 246270
Summary: Parameterized version number so it's only defined in one place.
Index: Framework.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/Framework.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Framework.java 29 Jun 2007 20:32:27 -0000 1.3
+++ Framework.java 2 Jul 2007 18:49:16 -0000 1.4
@@ -211,7 +211,8 @@
_bannerPanel = new JPanel(new BorderLayout());
_bannerPanel.getAccessibleContext().setAccessibleDescription(
- _resource_theme.getString("banner","console"));
+ _resource_theme.getString("banner","console") + " " +
+ VersionInfo.getVersionNumber());
_bannerPanel.setBorder(
BorderFactory.createEmptyBorder(0, 0, 0, 0));
Index: FrameworkInitializer.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FrameworkInitializer.java 29 Jun 2007 20:32:27 -0000 1.2
+++ FrameworkInitializer.java 2 Jul 2007 18:49:18 -0000 1.3
@@ -264,7 +264,7 @@
ResourceSet themeResource = new ResourceSet("com.netscape.management.client.theme.theme");
aboutDialog = new AboutDialog(parent,
themeResource.getString("defaultAbout",
- "dialogTitle"));
+ "dialogTitle") + " " + VersionInfo.getVersionNumber());
aboutDialog.setProduct( new RemoteImage(
themeResource.getString("defaultAbout",
"productLogo")),
16 years, 9 months