Author: nhosoi Update of /cvs/dirsec/console/src/com/netscape/management/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628/src/com/netscape/management/client Modified Files: AboutDialog.java FontPreferencesTab.java Framework.java ResourcePage.java SettingsPreferencesTab.java default.properties defaultLicense.properties Log Message: [186105] Admin Server Makefile updates for Internal build Comment #12 . Preference version number was changed to CONSOLE-MAJOR-VERSION.0 . To do that, introduced Console.MAJOR_VERSION . changed to include the patch number in the jar file name . changed to create a symlink: redhat-mcc-7.2.jar pointing to redhat-mcc-7.2.0.jar Index: AboutDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- AboutDialog.java 2 Dec 2005 21:30:04 -0000 1.4 +++ AboutDialog.java 24 Mar 2006 01:04:07 -0000 1.5 @@ -179,7 +179,7 @@ AboutDialog dialog = new AboutDialog(f, "Fedora Management Console"); - dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 1.0\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms"); + dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 1.0.2\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms"); dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains Phaos SSL encryption software from Phaos Technology Corporation. Copyright &copy 1998 Phaos Technology Corporation. All Rights Reserved"); dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains encryption software from RSA Data Security, Inc. Copyright © 1994 RSA Data Security, Inc. All rights reserved."); Index: FontPreferencesTab.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FontPreferencesTab.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- FontPreferencesTab.java 18 Jul 2005 00:34:07 -0000 1.1.1.1 +++ FontPreferencesTab.java 24 Mar 2006 01:04:07 -0000 1.2 @@ -57,7 +57,7 @@ public FontPreferencesTab() { - preferenceManager = PreferenceManager.getPreferenceManager(Framework.IDENTIFIER, Framework.VERSION); + preferenceManager = PreferenceManager.getPreferenceManager(Framework.IDENTIFIER, Framework.MAJOR_VERSION); setTitle(i18n("title")); } Index: Framework.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/Framework.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Framework.java 18 Jul 2005 00:34:07 -0000 1.1.1.1 +++ Framework.java 24 Mar 2006 01:04:07 -0000 1.2 @@ -47,6 +47,7 @@ public class Framework extends JFrame implements IFramework, SuiConstants { public static final String IDENTIFIER = Console.IDENTIFIER; public static final String VERSION = Console.VERSION; + public static final String MAJOR_VERSION = Console.MAJOR_VERSION; public static final String PREFERENCES_GENERAL = "General"; public static final String PREFERENCES_FONTS = "Fonts"; @@ -653,7 +654,7 @@ if (_preferenceManager == null) _preferenceManager = PreferenceManager.getPreferenceManager(IDENTIFIER, - VERSION); + MAJOR_VERSION); Preferences p = _preferenceManager.getPreferences(PREFERENCES_GENERAL); Index: ResourcePage.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/ResourcePage.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ResourcePage.java 18 Jul 2005 00:34:08 -0000 1.1.1.1 +++ ResourcePage.java 24 Mar 2006 01:04:07 -0000 1.2 @@ -223,7 +223,7 @@ */ public void initialize(IFramework framework) { PreferenceManager pm = PreferenceManager.getPreferenceManager( - Framework.IDENTIFIER, Framework.VERSION); + Framework.IDENTIFIER, Framework.MAJOR_VERSION); Preferences p = pm.getPreferences(PREFERENCES_RESOURCES); setMainPanel(p.getBoolean(PREFERENCE_SHOW_TREE, true)); @@ -761,7 +761,7 @@ ResourcePage.this.add(_customPanel); } PreferenceManager pm = PreferenceManager.getPreferenceManager( - Framework.IDENTIFIER, Framework.VERSION); + Framework.IDENTIFIER, Framework.MAJOR_VERSION); Preferences p = pm.getPreferences(PREFERENCES_RESOURCES); p.set(PREFERENCE_SHOW_TREE, _isTreeVisible); } Index: SettingsPreferencesTab.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/SettingsPreferencesTab.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- SettingsPreferencesTab.java 18 Jul 2005 00:34:08 -0000 1.1.1.1 +++ SettingsPreferencesTab.java 24 Mar 2006 01:04:07 -0000 1.2 @@ -147,19 +147,19 @@ Console.setLocalPreferencesFlag( !storeDirectoryRadio.isSelected()); PreferenceManager pm = PreferenceManager.getPreferenceManager( - Framework.IDENTIFIER, Framework.VERSION); + Framework.IDENTIFIER, Framework.MAJOR_VERSION); Preferences p = pm.getPreferences(Framework.PREFERENCES_GENERAL); if (storeLocalState != storeDiskRadio.isSelected()) { if (storeDiskRadio.isSelected()) { copyPreferences(pm, new FilePreferenceManager( - Framework.IDENTIFIER, Framework.VERSION)); + Framework.IDENTIFIER, Framework.MAJOR_VERSION)); } else { ConsoleInfo ci = Console.getConsoleInfo(); PreferenceManager toMgr = new LDAPPreferenceManager( ci.getLDAPConnection(), ci.getUserPreferenceDN(), - Framework.IDENTIFIER, Framework.VERSION); + Framework.IDENTIFIER, Framework.MAJOR_VERSION); copyPreferences(pm, toMgr); } } Index: default.properties =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- default.properties 26 Oct 2005 23:16:15 -0000 1.3 +++ default.properties 24 Mar 2006 01:04:07 -0000 1.4 @@ -63,8 +63,8 @@ menu-HelpSearch=&Search menu-HelpIndex=&Index menu-HelpWebHelp=Web-based &Resources -menu-HelpSuiteSpot=&Fedora Website -menu-HelpDocHome=http://fedora.redhat.com +menu-HelpSuiteSpot=Documentation &Home +menu-HelpDocHome=directory.fedora.redhat.com menu-HelpBookshelf=&Bookshelf menu-HelpAbout=&About... @@ -123,5 +123,5 @@ fontTab-fontProfile=Font Profile fontTab-table_tt=Font table of screen elements and corresponding sample font -banner-console=Fedora Management Console 1.0 +banner-console=Fedora Management Console 1.0.2 Index: defaultLicense.properties =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/defaultLicense.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- defaultLicense.properties 26 Oct 2005 23:16:15 -0000 1.3 +++ defaultLicense.properties 24 Mar 2006 01:04:07 -0000 1.4 @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK # -defaultAbout-dialogTitle=Fedora Management Console 1.0 +defaultAbout-dialogTitle=Fedora Management Console 1.0.2 defaultAbout-productLogo=com/netscape/management/client/images/logo32.gif defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved. defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.