[Fedora-directory-commits] adminserver/admserv/newinst/insadm Makefile, 1.13, 1.14
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/insadm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771/admserv/newinst/insadm
Modified Files:
Makefile
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile 29 Sep 2005 22:12:00 -0000 1.13
+++ Makefile 24 Mar 2006 01:13:08 -0000 1.14
@@ -315,8 +315,8 @@
-rm $(STARTCONZDIR)/console.z
mkdir -p $(STARTCONZDIR)/java/jars
mkdir -p $(STARTCONZDIR)/bin/base
- cp $(ADMIN_JARS)/admserv$(ADM_SUF).jar $(STARTCONZDIR)/java/jars
- cp $(ADMIN_JARS)/admserv$(ADM_SUF)_en.jar $(STARTCONZDIR)/java/jars
+ cp $(ADMIN_JARS)/$(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(STARTCONZDIR)/java/jars
+ cp $(ADMIN_JARS)/$(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(STARTCONZDIR)/java/jars
cp $(SRC_ADMSERV)/viewurl.exe $(STARTCONZDIR)/bin/base
cp $(SRC_ADMSERV)/jre.inf $(STARTCONZDIR)/java
cd $(STARTCONZDIR) ; $(ZIP) -r console.z '*'
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv/console/src/com/netscape/management/admserv/cmdln version.dat, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/cmdln
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771/admserv/console/src/com/netscape/management/admserv/cmdln
Modified Files:
version.dat
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data
Index: version.dat
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/cmdln/version.dat,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- version.dat 1 Feb 2005 23:14:31 -0000 1.1.1.1
+++ version.dat 24 Mar 2006 01:13:00 -0000 1.2
@@ -1,5 +1,5 @@
-Administration Server Command Line (admconfig) version 6.2
-
-Copyright (c) 2001 Netscape Communications Corp.
+Administration Server Command Line (admconfig) version 7.2.1
+Copyright (C) 2005 Red Hat, Inc.
+All rights reserved.
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv/console build.properties, 1.11, 1.12
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771/admserv/console
Modified Files:
build.properties
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties 21 Mar 2006 18:33:54 -0000 1.11
+++ build.properties 24 Mar 2006 01:12:35 -0000 1.12
@@ -21,7 +21,7 @@
# END COPYRIGHT BLOCK
adminconsole.root=../..
-mcc.version=1.0
+mcc.version=1.0.2
admin.core=admserv
admin.brand=fedora
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.44, 1.45
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771/admserv
Modified Files:
pkgadmin.mk
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pkgadmin.mk 22 Mar 2006 22:53:48 -0000 1.44
+++ pkgadmin.mk 24 Mar 2006 01:12:27 -0000 1.45
@@ -154,7 +154,8 @@
# grab the jar files
cd $(ADMIN_JARS) ; \
- cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+ cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars; \
+ (cd $(CLIENT_DIR)/java/jars; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF).jar; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF)_en.jar)
#
# Cleanup before making distributable zip
18 years, 1 month
[Fedora-directory-commits] adminserver components.mk, 1.43, 1.44 nsconfig.mk, 1.27, 1.28
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771
Modified Files:
components.mk nsconfig.mk
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- components.mk 21 Mar 2006 19:48:49 -0000 1.43
+++ components.mk 24 Mar 2006 01:12:20 -0000 1.44
@@ -356,10 +356,11 @@
# Console java classes
#############################################################
-NMCJDK_SUF = 1.0
+NMCJDK_SUF = 1.0.2
+NMCJDK_GEN_SUF = 1.0
NMCJDK_RELDATE = 20060320
-NMCJDK_COMP = console/$(NMCJDK_SUF)
+NMCJDK_COMP = console/$(NMCJDK_GEN_SUF)
NMCJDK_VERSION = $(NMCJDK_RELDATE)
@@ -383,6 +384,12 @@
mkdir -p $(CLASS_DEST)
# grab the jar files
$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR)/java -files $(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar
+# make symlinks; cannot FTP symlinked files
+ -(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-base-$(NMCJDK_GEN_SUF).jar)
+ -(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-mcc-$(NMCJDK_GEN_SUF).jar)
+ -(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar $(ADMIN_BRAND)-mcc-$(NMCJDK_GEN_SUF)_en.jar)
+ -(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-nmclf-$(NMCJDK_GEN_SUF).jar)
+ -(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar $(ADMIN_BRAND)-nmclf-$(NMCJDK_GEN_SUF)_en.jar)
# grab the startconsole program
$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files startconsole && chmod +x $(CLASS_DEST)/startconsole
else # INTERNAL_BUILD
@@ -394,7 +401,8 @@
#############################################################
JSS_SDK_VERSION = JSS_3_7_RTM
-JSSSDK = jss37.jar
+# xpclass.jar is copied to this name. don't put the minor version number
+JSSSDK = jss3.jar
XPCLASS = $(JSS_JAR_NAME)
ifeq ($(INT_JSS), 1)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nsconfig.mk 21 Mar 2006 19:48:49 -0000 1.27
+++ nsconfig.mk 24 Mar 2006 01:12:20 -0000 1.28
@@ -530,7 +530,8 @@
endif
endif
-ADM_SUF=1.0
+ADM_SUF=1.0.2
+ADM_GEN_SUF=1.0
# CLEAN THIS UP
18 years, 1 month
[Fedora-directory-commits] console/src/com/netscape/management/client/util LDAPUtil.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/console/src/com/netscape/management/client/util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628/src/com/netscape/management/client/util
Modified Files:
LDAPUtil.java
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: LDAPUtil.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/LDAPUtil.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LDAPUtil.java 18 Jul 2005 00:34:26 -0000 1.1.1.1
+++ LDAPUtil.java 24 Mar 2006 01:04:54 -0000 1.2
@@ -52,7 +52,7 @@
}
public static String getAdminGlobalParameterEntry() {
- return "ou=" + Console.VERSION + ", ou=admin, ou=Global Preferences,"+
+ return "ou=" + Console.MAJOR_VERSION + ", ou=admin, ou=Global Preferences,"+
_isieDN;
}
@@ -75,7 +75,7 @@
* @param product RDN for a server (e.g. "ou=admin" for the admin server)
*/
public static String getGlobalParameterEntry(String product) {
- return "ou=" + Console.VERSION + "," + product + ", ou=Global Preferences,"+
+ return "ou=" + Console.MAJOR_VERSION + "," + product + ", ou=Global Preferences,"+
_isieDN;
}
18 years, 1 month
[Fedora-directory-commits] console/src/com/netscape/management/client/ug ChangeDirectoryDialog.java, 1.1.1.1, 1.2 SearchResultPanel.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/console/src/com/netscape/management/client/ug
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628/src/com/netscape/management/client/ug
Modified Files:
ChangeDirectoryDialog.java SearchResultPanel.java
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: ChangeDirectoryDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/ug/ChangeDirectoryDialog.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ChangeDirectoryDialog.java 18 Jul 2005 00:34:21 -0000 1.1.1.1
+++ ChangeDirectoryDialog.java 24 Mar 2006 01:04:46 -0000 1.2
@@ -345,7 +345,7 @@
*/
private void loadPreferences() {
PreferenceManager pm = PreferenceManager.getPreferenceManager(
- Framework.IDENTIFIER, Framework.VERSION);
+ Framework.IDENTIFIER, Framework.MAJOR_VERSION);
Preferences p = pm.getPreferences(PREFERENCES_SEARCH_DIRECTORY);
String host = p.getString(PREFERENCE_HOST, _info.getUserHost());
@@ -397,7 +397,7 @@
*/
private void savePreferences() {
PreferenceManager pm = PreferenceManager.getPreferenceManager(
- Framework.IDENTIFIER, Framework.VERSION);
+ Framework.IDENTIFIER, Framework.MAJOR_VERSION);
Preferences p = pm.getPreferences(PREFERENCES_SEARCH_DIRECTORY);
p.set(PREFERENCE_HOST, _info.getUserHost());
Index: SearchResultPanel.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/ug/SearchResultPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- SearchResultPanel.java 18 Jul 2005 00:34:24 -0000 1.1.1.1
+++ SearchResultPanel.java 24 Mar 2006 01:04:46 -0000 1.2
@@ -64,7 +64,7 @@
Vector header = new Vector();
PreferenceManager pm = PreferenceManager.getPreferenceManager(
- Framework.IDENTIFIER, Framework.VERSION);
+ Framework.IDENTIFIER, Framework.MAJOR_VERSION);
Preferences p = pm.getPreferences(PREFERENCES_RESULT_TABLE);
int count = p.getInt(PREFERENCE_COLUMN_COUNT, -1);
18 years, 1 month
[Fedora-directory-commits] console/src/com/netscape/management/client/topology/customview ViewSelectorComponent.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology/customview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628/src/com/netscape/management/client/topology/customview
Modified Files:
ViewSelectorComponent.java
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: ViewSelectorComponent.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/customview/ViewSelectorComponent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ViewSelectorComponent.java 18 Jul 2005 00:34:20 -0000 1.1.1.1
+++ ViewSelectorComponent.java 24 Mar 2006 01:04:38 -0000 1.2
@@ -80,13 +80,13 @@
pm = new LDAPPreferenceManager(ci.getLDAPConnection(),
ci.getUserPreferenceDN(), Framework.IDENTIFIER,
- Framework.VERSION);
+ Framework.MAJOR_VERSION);
userViewPreferences = (LDAPPreferences) pm.getPreferences("CustomViews"); // private views
privateViewDN = userViewPreferences.getDN();
pm = new LDAPPreferenceManager(ci.getLDAPConnection(),
"ou=Global Preferences," + LDAPUtil.getInstalledSoftwareDN(), "admin",
- Framework.VERSION);
+ Framework.MAJOR_VERSION);
publicViewPreferences = (LDAPPreferences) pm.getPreferences("PublicViews");
publicViewDN = publicViewPreferences.getDN();
18 years, 1 month
[Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.5, 1.6 console.properties, 1.3, 1.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7628/src/com/netscape/management/client/console
Modified Files:
Console.java console.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: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Console.java 9 Feb 2006 23:57:20 -0000 1.5
+++ Console.java 24 Mar 2006 01:04:14 -0000 1.6
@@ -56,7 +56,8 @@
// preference information
//
public static final String IDENTIFIER = "Console";
- public static final String VERSION = "1.0";
+ public static final String VERSION = "1.0.2";
+ public static final String MAJOR_VERSION = "1.0";
public static final String PREFERENCES_LOGIN =
IDENTIFIER + "." + VERSION + ".Login.preferences";
Index: console.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- console.properties 26 Oct 2005 23:16:23 -0000 1.3
+++ console.properties 24 Mar 2006 01:04:14 -0000 1.4
@@ -18,7 +18,7 @@
# END COPYRIGHT BLOCK
#
console-title=Fedora Management Console
-console-displayVersion=1.0
+console-displayVersion=1.0.2
login-username=User ID:
login-password=Password:
18 years, 1 month
[Fedora-directory-commits] console/src/com/netscape/management/client AboutDialog.java, 1.4, 1.5 FontPreferencesTab.java, 1.1.1.1, 1.2 Framework.java, 1.1.1.1, 1.2 ResourcePage.java, 1.1.1.1, 1.2 SettingsPreferencesTab.java, 1.1.1.1, 1.2 default.properties, 1.3, 1.4 defaultLicense.properties, 1.3, 1.4
by Doctor Conrad
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 © 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.
18 years, 1 month