Attachment 158240 Details for Bug 246270 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 42.73 KB, created by Nathan Kinder on 2007-06-29 18:27:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-06-29 18:27:38 UTC

Size: 42.73 KB

patch

obsolete

>Index: console/build.properties
>===================================================================
>RCS file: /cvs/dirsec/console/build.properties,v
>retrieving revision 1.10
>diff -u -5 -t -r1.10 build.properties
>--- console/build.properties	13 Jun 2007 20:33:08 -0000	1.10
>+++ console/build.properties	29 Jun 2007 17:52:43 -0000
>@@ -22,13 +22,13 @@
> lang=en
> 
> console.brand=fedora
> 
> console.root=.
>-console.version=10
>-console.dotversion=1.0.3
>-console.dotgenversion=1.0
>+console.version=11
>+console.dotversion=1.1.0
>+console.dotgenversion=1.1
> 
> mcc.core=${console.brand}-mcc
> mcc.name=${mcc.core}-${console.dotversion}
> mcc.gen.name=${mcc.core}-${console.dotgenversion}
> 
>@@ -41,5 +41,8 @@
> base.gen.name=${base.core}-${console.dotgenversion}
> 
> theme.core=${console.brand}-theme
> theme.name=${theme.core}-${console.dotversion}
> theme.gen.name=${theme.core}-${console.dotgenversion}
>+
>+jss.jar.name=jss4.jar
>+ldapjdk.jar.name=ldapjdk.jar
>Index: console/build.xml
>===================================================================
>RCS file: /cvs/dirsec/console/build.xml,v
>retrieving revision 1.13
>diff -u -5 -t -r1.13 build.xml
>--- console/build.xml	13 Jun 2007 20:33:08 -0000	1.13
>+++ console/build.xml	29 Jun 2007 17:52:44 -0000
>@@ -40,21 +40,24 @@
>   
>   <target name="prepare_build" depends="prepare_imports">
>     
>     <mkdir dir="${built.classdir}"/>
> 
>+    
>+    <property name="classdest"              value="/usr/share/java"/>
>+
>     
>     <property name="ldapjdk.local.location" value="/usr/share/java"/>
>-    <property name="jss.local.location"     value="/usr/share/java"/>
>+    <property name="jss.local.location"     value="/usr/lib/java"/>
>     <property name="jsslib.local.location"  value="/usr/lib"/>
>     <property name="nss.local.location"     value="/usr/lib"/>
>     <property name="nspr.local.location"    value="/usr/lib"/>
> 
>     
>     <path id="console.classpath">
>-      <pathelement location="${ldapjdk.local.location}/ldapjdk.jar"/>
>-      <pathelement location="${jss.local.location}/jss3.jar"/>
>+      <pathelement location="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
>+      <pathelement location="${jss.local.location}/${jss.jar.name}"/>
>     </path>
> 
>     
>     <exec executable="${console.root}/buildnum.pl" vmlauncher="true">
>       <arg line="-p ${built.dir}"/>
>@@ -122,11 +125,11 @@
> 
>   <target name="import_jss_jar" depends="prepare_imports" if="imports.file" unless="jss.jar.import.exists">
>     <mkdir dir="${imports.dir}/jss"/>
>     <get src="${jss.jar.location}/${jss.jar.import}"
>          dest="${imports.dir}/jss/${jss.jar.import}"/>
>-    <copy file="${imports.dir}/jss/${jss.jar.import}" tofile="${imports.dir}/jss/jss3.jar"/>
>+    <copy file="${imports.dir}/jss/${jss.jar.import}" tofile="${imports.dir}/jss/${jss.jar.name}"/>
>   </target>
> 
>   <target name="import_jss_lib" depends="prepare_imports" if="imports.file" unless="jss.lib.import.exists">
>     <mkdir dir="${imports.dir}/jss"/>
>     <get src="${jss.lib.location}/${jss.lib.import}"
>@@ -149,23 +152,23 @@
>   </target>
> 
>   
>   <target name="build" depends="prepare_build, import_ldapjdk, import_jss_jar">
>     
>-    <fail message="LDAP JDK (ldapjdk.jar) does not exist in ${ldapjdk.local.location}">
>+    <fail message="LDAP JDK (${ldapjdk.jar.name}) does not exist in ${ldapjdk.local.location}">
>       Please set the correct location with -Dldapjdk.local.location=[path]
>       <condition>
>         <not>
>-          <available file="${ldapjdk.local.location}/ldapjdk.jar"/>
>+          <available file="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
>         </not>
>       </condition>
>     </fail>
>-    <fail message="JSS (jss3.jar) does not exist in ${jss.local.location}">
>+    <fail message="JSS (${jss.jar.name}) does not exist in ${jss.local.location}">
>       Please set the correct location with -Djss.local.location=[path]
>       <condition>
>         <not>
>-          <available file="${jss.local.location}/jss3.jar"/>
>+          <available file="${jss.local.location}/${jss.jar.name}"/>
>         </not>
>       </condition>
>     </fail>
> 
>     
>@@ -178,10 +181,25 @@
>              verbose="no"
>              fork="true"
>              excludes="**/CVS/**">
>              <classpath refid="console.classpath" />
>     </javac>
>+
>+    
>+    <copy file="startconsole" todir="${release.dir}"/>
>+    <replace file="${release.dir}/startconsole">
>+      <replacefilter token="@classdest@" value="${classdest}"/>
>+      <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/> 
>+      <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
>+      <replacefilter token="@basejar@" value="${base.name}.jar"/>
>+      <replacefilter token="@mccjar@" value="${mcc.name}.jar"/>
>+      <replacefilter token="@mcclangjar@" value="${mcc.name}_${lang}.jar"/>
>+      <replacefilter token="@nmclfjar@" value="${nmclf.name}.jar"/>
>+      <replacefilter token="@nmclflangjar@" value="${nmclf.name}_${lang}.jar"/>
>+      <replacefilter token="@themejar@" value="${theme.name}_${lang}.jar"/>
>+      <replacefilter token="@libdir@" value="${lib.dir}"/>
>+    </replace>
>   </target>
> 
>   
>   <target name="build_jars" depends="build,prepare_jars">
>     
>@@ -284,12 +302,12 @@
>     <exec executable="ln" dir="${java.dir}" vmlauncher="true">
>       <arg line="-s ${base.name}.jar ${base.gen.name}.jar"/>
>     </exec>
> 
>     
>-    <copy file="${ldapjdk.local.location}/ldapjdk.jar" todir="${java.dir}"/>
>-    <copy file="${jss.local.location}/jss3.jar" todir="${java.dir}"/>
>+    <copy file="${ldapjdk.local.location}/${ldapjdk.jar.name}" todir="${java.dir}"/>
>+    <copy file="${jss.local.location}/${jss.jar.name}" todir="${java.dir}"/>
>     <copy todir="${lib.dir}">
>       <fileset dir="${jsslib.local.location}">
>         <include name="libjss*"/>
>       </fileset>
>       <fileset dir="${nss.local.location}">
>Index: console/fedora-console.spec
>===================================================================
>RCS file: /cvs/dirsec/console/fedora-console.spec,v
>retrieving revision 1.1
>diff -u -5 -t -r1.1 fedora-console.spec
>--- console/fedora-console.spec	29 Nov 2005 18:36:50 -0000	1.1
>+++ console/fedora-console.spec	29 Jun 2007 17:52:44 -0000
>@@ -1,67 +1,101 @@
>+%define major_version 1.1
>+%define minor_version 0
>+
> Name: fedora-console
>-Version: 1.0
>+Version: %{major_version}.%{minor_version}
> Release: 1
> Group: Applications
> Vendor: Fedora Project
> URL: http://directory.fedora.redhat.com
> License: LGPL
> Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
> Summary: Fedora Management Console
> BuildRoot: %{_tmppath}/%{name}-%{version}-root
>+BuildArch: noarch
> Source: %{name}-%{version}.tar.gz
> Autoreq: 0
> AutoReqProv: no
>-Requires: ldapjdk >= 4.17, jss >= 3.6
>-BuildPreReq: ldapjdk >= 4.17, jss >= 3.6  
>+Requires: fedora-console-framework >= %{version}
>+BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, jss >=  4.2 
> 
> %description
> A Java based remote management console used for Managing Fedora
> Administration Server and Fedora Directory Server.
> 
> # prep and setup expect there to be a Source file
> # in the /usr/src/redhat/SOURCES directory - it will be unpacked
> # in the _builddir (not BuildRoot)
>+
>+%package framework
>+Summary: Fedora Management Console Framework
>+Requires: ldapjdk >= 4.18, jss >= 4.2
>+Group: System Environment/Libraries
>+
>+%description framework
>+A Java Management Console framework used for remote server management.
>+
> %prep
> %setup -q
>                                                                                 
> %build
> cd console
>-ant
>+ant -Dlib.dir=%{_libdir}
>                                                                                 
> %install
> rm -rf $RPM_BUILD_ROOT
> install -d $RPM_BUILD_ROOT/usr/share/java
> install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java
> install -d $RPM_BUILD_ROOT/usr/bin
>-install -m777 console/startconsole $RPM_BUILD_ROOT/usr/bin
>+install -m777 built/release/startconsole $RPM_BUILD_ROOT/usr/bin
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> %files
> %defattr(-,root,root)
>+/usr/share/java/fedora-theme-%{version}_en.jar
>+/usr/bin/startconsole
>+
>+%files framework
>+%defattr(-,root,root)
> /usr/share/java/fedora-base-%{version}.jar
> /usr/share/java/fedora-mcc-%{version}.jar
> /usr/share/java/fedora-mcc-%{version}_en.jar
> /usr/share/java/fedora-nmclf-%{version}.jar
> /usr/share/java/fedora-nmclf-%{version}_en.jar
>-/usr/bin/startconsole
>                                                                                 
> %post
> cd /usr/share/java
>+ln -s fedora-base-%{version}.jar fedora-base-%{major_version}.jar
> ln -s fedora-base-%{version}.jar fedora-base.jar
>+ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar
> ln -s fedora-mcc-%{version}.jar fedora-mcc.jar
>+ln -s fedora-mcc-%{version}_en.jar fedora-mcc-%{major_version}_en.jar
> ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar
>+ln -s fedora-nmclf-%{version}.jar fedora-nmclf-%{major_version}.jar
> ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar
>+ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar
> ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar
>+ln -s fedora-theme-%{version}_en.jar fedora-theme-%{major_version}_en.jar
>+ln -s fedora-theme-%{version}_en.jar fedora-theme_en.jar
> 
> %preun
>+rm -rf /usr/share/java/fedora-base-%{major_version}.jar
> rm -rf /usr/share/java/fedora-base.jar
>+rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar
> rm -rf /usr/share/java/fedora-mcc.jar
>+rm -rf /usr/share/java/fedora-mcc-%{major_version}_en.jar
> rm -rf /usr/share/java/fedora-mcc_en.jar
>+rm -rf /usr/share/java/fedora-nmclf-%{major_version}.jar
> rm -rf /usr/share/java/fedora-nmclf.jar
>+rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar
> rm -rf /usr/share/java/fedora-nmclf_en.jar
>+rm -rf /usr/share/java/fedora-theme-%{major_version}_en.jar
>+rm -rf /usr/share/java/fedora-theme_en.jar
> 
> %changelog
>+* Fri Jun 29 2007 Nathan Kinder <nkinder@redhat.com 1.1.0-1
>+- Updated for 1.1.0 release
>+
> * Mon Nov 14 2005 Nathan Kinder <nkinder@redhat.com> 1.0-1
> - Initial creation
>Index: console/startconsole
>===================================================================
>RCS file: /cvs/dirsec/console/startconsole,v
>retrieving revision 1.6
>diff -u -5 -t -r1.6 startconsole
>--- console/startconsole	13 Jun 2007 20:33:08 -0000	1.6
>+++ console/startconsole	29 Jun 2007 17:52:44 -0000
>@@ -24,10 +24,11 @@
> then
>   echo "$0: The java program is not in your path, or is not executable.";
>   exit 1
> fi
> 
>-THEME_JAR=/usr/share/java/fedora-theme-1.0.3_en.jar
>+CLASSDEST=@classdest@
>+
> #
> # Launch the Console
> #
>-java -ms8m -mx64m -cp /usr/share/java/jss3.jar:/usr/share/java/ldapjdk.jar:/usr/share/java/fedora-base-1.0.3.jar:/usr/share/java/fedora-mcc-1.0.3.jar:/usr/share/java/fedora-mcc-1.0.3_en.jar:/usr/share/java/fedora-nmclf-1.0.3.jar:/usr/share/java/fedora-nmclf-1.0.3_en.jar:$THEME_JAR -Djava.library.path=/usr/lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
>+java -ms8m -mx64m -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ -Djava.library.path=@libdir@ -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
>Index: console/src/com/netscape/management/client/AboutDialog.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v
>retrieving revision 1.6
>diff -u -5 -t -r1.6 AboutDialog.java
>--- console/src/com/netscape/management/client/AboutDialog.java	29 Sep 2006 17:17:20 -0000	1.6
>+++ console/src/com/netscape/management/client/AboutDialog.java	29 Jun 2007 17:52:44 -0000
>@@ -163,26 +163,6 @@
>                 GridBagConstraints.BOTH, 0, 0,
>                 DIFFERENT_COMPONENT_SPACE, 0);
>         super.show();
>     }
> 
>-
>-
>-    //testing program
>-    /*public static void main(String arg[]) {
>-
>-        JFrame f = new JFrame();
>-        f.setSize(432,400);
>-
>-        try {
>-            UIManager.setLookAndFeel("com.netscape.management.nmclf.SuiLookAndFeel");
>-        } catch (Exception e) {}
>-
>-
>-        AboutDialog dialog = new AboutDialog(f, "Fedora Management Console");
>-        dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 1.0.3\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 &copy; 1994 RSA Data Security, Inc.  All rights reserved.");
>-
>-        dialog.show();
>-}*/
> }
>Index: console/src/com/netscape/management/client/Framework.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/Framework.java,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 Framework.java
>--- console/src/com/netscape/management/client/Framework.java	24 Mar 2006 01:04:07 -0000	1.2
>+++ console/src/com/netscape/management/client/Framework.java	29 Jun 2007 17:52:44 -0000
>@@ -80,10 +80,12 @@
>     private static Dimension _initialDimension = null;
>     private Image _bannerImage = null;
> 
>     public static String _imageSource = "com/netscape/management/client/images/";
>     public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.default");
>+    public static ResourceSet _resource_theme = new 
>+            ResourceSet("com.netscape.management.client.theme.theme");
>     public static Help _help = new Help("com.netscape.management.client.default");
> 
>     protected boolean _isPageInitialized[];
>     protected IFrameworkInitializer _frameworkInitializer;
>     protected JPanel _framePanel;
>@@ -206,11 +208,12 @@
>         _framePanel.setBorder(
>                 BorderFactory.createEmptyBorder(2, HORIZ_WINDOW_INSET,
>                 2, HORIZ_WINDOW_INSET));
> 
>         _bannerPanel = new JPanel(new BorderLayout());
>-        _bannerPanel.getAccessibleContext().setAccessibleDescription(i18n("banner","console"));
>+        _bannerPanel.getAccessibleContext().setAccessibleDescription(
>+                _resource_theme.getString("banner","console"));
>         _bannerPanel.setBorder(
>                 BorderFactory.createEmptyBorder(0, 0, 0, 0));
> 
>         _pagePanel = new JPanel();
>         _pagePanel.setLayout(new BorderLayout());
>Index: console/src/com/netscape/management/client/FrameworkInitializer.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 FrameworkInitializer.java
>--- console/src/com/netscape/management/client/FrameworkInitializer.java	18 Jul 2005 00:34:07 -0000	1.1.1.1
>+++ console/src/com/netscape/management/client/FrameworkInitializer.java	29 Jun 2007 17:52:44 -0000
>@@ -259,19 +259,20 @@
>         try {
>             UtilConsoleGlobals.getActivatedFrame().setCursor(
>                     new Cursor(Cursor.WAIT_CURSOR));
>             if (aboutDialog == null) {
>                 ResourceSet aboutDialogResource = new ResourceSet("com.netscape.management.client.defaultLicense");
>+                ResourceSet themeResource = new ResourceSet("com.netscape.management.client.theme.theme");
>                 aboutDialog = new AboutDialog(parent,
>-                        aboutDialogResource.getString("defaultAbout",
>+                        themeResource.getString("defaultAbout",
>                         "dialogTitle"));
>                 aboutDialog.setProduct( new RemoteImage(
>-                        aboutDialogResource.getString("defaultAbout",
>+                        themeResource.getString("defaultAbout",
>                         "productLogo")),
>                         aboutDialogResource.getString("defaultAbout",
>                         "productCopyright"),
>-                        aboutDialogResource.getString("defaultAbout",
>+                        themeResource.getString("defaultAbout",
>                         "productLicense"));
> 
>                 StringTokenizer st = new StringTokenizer(
>                         aboutDialogResource.getString("defaultAbout",
>                         "vendorsList"), ",", false);
>Index: console/src/com/netscape/management/client/default.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
>retrieving revision 1.6
>diff -u -5 -t -r1.6 default.properties
>--- console/src/com/netscape/management/client/default.properties	13 Jun 2007 20:33:08 -0000	1.6
>+++ console/src/com/netscape/management/client/default.properties	29 Jun 2007 17:52:44 -0000
>@@ -121,7 +121,5 @@
> fontTab-columnFont=Font Sample
> fontTab-sampleText=AaBbYyZz
> fontTab-fontProfile=Font Profile
> fontTab-table_tt=Font table of screen elements and corresponding sample font
> 
>-#banner-console=Fedora Management Console 1.0.3
>-
>Index: console/src/com/netscape/management/client/defaultLicense.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/defaultLicense.properties,v
>retrieving revision 1.6
>diff -u -5 -t -r1.6 defaultLicense.properties
>--- console/src/com/netscape/management/client/defaultLicense.properties	13 Jun 2007 20:33:08 -0000	1.6
>+++ console/src/com/netscape/management/client/defaultLicense.properties	29 Jun 2007 17:52:44 -0000
>@@ -15,11 +15,8 @@
> # You should have received a copy of the GNU Lesser General Public
> # License along with this library; if not, write to the Free Software
> # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> # END COPYRIGHT BLOCK
> #
>-#defaultAbout-dialogTitle=Fedora Management Console 1.0.3
>-#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.
>+defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2007 Red Hat, Inc.\nAll rights reserved.
> defaultAbout-vendorsList=sun
> defaultAbout-vendor-sun-license=Java is a trademark or registered trademark of Sun Microsystems, Inc in the United States and other countries.\n\nJavaScript is a trademark of Sun Microsystems, Inc. used under license for technology invented and implemented by Netscape.
>Index: console/src/com/netscape/management/client/console/Console.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
>retrieving revision 1.8
>diff -u -5 -t -r1.8 Console.java
>--- console/src/com/netscape/management/client/console/Console.java	13 Jun 2007 20:33:09 -0000	1.8
>+++ console/src/com/netscape/management/client/console/Console.java	29 Jun 2007 17:52:45 -0000
>@@ -54,12 +54,12 @@
> 
>     //
>     // preference information
>     //
>     public static final String IDENTIFIER = "Console";
>-    public static final String VERSION = "1.0.3";
>-    public static final String MAJOR_VERSION = "1.0";
>+    public static final String VERSION = "1.1.0";
>+    public static final String MAJOR_VERSION = "1.1";
>     public static final String PREFERENCES_LOGIN =
>             IDENTIFIER + "." + VERSION + ".Login.preferences";
> 
>     public static final String PREFERENCE_UID = "UserID";
>     public static final String PREFERENCE_REMEMBER_UID =
>@@ -83,11 +83,11 @@
>     //
>     public static Preferences _preferences;
>     public static ConsoleInfo _info;
>     public static String _consoleAdminURL;
>     public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.console");
>-    public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.console");
>+    public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
> 
>     //
>     // private values
>     //
>     private String _adminServerSIE;
>Index: console/src/com/netscape/management/client/console/LoginDialog.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/LoginDialog.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 LoginDialog.java
>--- console/src/com/netscape/management/client/console/LoginDialog.java	18 Jul 2005 00:34:15 -0000	1.1.1.1
>+++ console/src/com/netscape/management/client/console/LoginDialog.java	29 Jun 2007 17:52:45 -0000
>@@ -55,11 +55,11 @@
>      * @param userid user ID
>      * @param url admin server url
>      */
>     public LoginDialog(Frame parentFrame, String userid, String initialURL, Vector recentURLs) {
>         this(parentFrame, userid, initialURL, recentURLs,
>-                Console._resource.getString(_resourcePrefix, "title"),
>+                Console._resource_theme.getString(_resourcePrefix, "title"),
>                 "login");
>     }
> 
>     /**
>       * constructor which let the caller decides the title and specifies recently used urls
>Index: console/src/com/netscape/management/client/console/console.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
>retrieving revision 1.6
>diff -u -5 -t -r1.6 console.properties
>--- console/src/com/netscape/management/client/console/console.properties	13 Jun 2007 20:33:09 -0000	1.6
>+++ console/src/com/netscape/management/client/console/console.properties	29 Jun 2007 17:52:45 -0000
>@@ -17,11 +17,11 @@
> # 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.0.3
>+console-displayVersion=1.1
> 
> login-username=User ID:
> login-password=Password:
> login-url=Administration URL:
> #login-title=Fedora Management Console Login
>Index: console/src/com/netscape/management/client/theme/theme.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v
>retrieving revision 1.1
>diff -u -5 -t -r1.1 theme.properties
>--- console/src/com/netscape/management/client/theme/theme.properties	13 Jun 2007 20:33:09 -0000	1.1
>+++ console/src/com/netscape/management/client/theme/theme.properties	29 Jun 2007 17:52:45 -0000
>@@ -19,14 +19,14 @@
> #
> 
> console-title=Fedora Management Console
> console-useragent=Fedora-Management-Console
> login-title=Fedora Management Console Login
>-banner-console=Fedora Management Console 1.0.3
>+banner-console=Fedora Management Console 1.1
> 
>-defaultAbout-dialogTitle=Fedora Management Console 1.0.3
>-defaultAbout-productLogo=com/netscape/management/client/themed/images/logo32.gif
>+defaultAbout-dialogTitle=Fedora Management Console 1.1
>+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.
> 
> CertInstallTypePage-defaultServerName=Fedora Server
> CertInstallTypePage-defaultSIE=Fedora Server Instance
> 
>Index: console/src/com/netscape/management/client/theme/images/logo16.gif
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/images/logo16.gif,v
>retrieving revision 1.1
>diff -u -5 -t -r1.1 logo16.gif
>Binary files /tmp/cvsIbwBRD and logo16.gif differ
>Index: console/src/com/netscape/management/client/theme/images/logo32.gif
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/images/logo32.gif,v
>retrieving revision 1.1
>diff -u -5 -t -r1.1 logo32.gif
>Binary files /tmp/cvsri6vRK and logo32.gif differ
>Index: console/src/com/netscape/management/client/topology/AbstractServerObject.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/AbstractServerObject.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 AbstractServerObject.java
>--- console/src/com/netscape/management/client/topology/AbstractServerObject.java	18 Jul 2005 00:34:18 -0000	1.1.1.1
>+++ console/src/com/netscape/management/client/topology/AbstractServerObject.java	29 Jun 2007 17:52:45 -0000
>@@ -65,11 +65,11 @@
>     private StatusThread _statusThread;
> 
>     // attributes of objectclass netscapeServer
>     static String _serverDataKey[] = new String[]{ "cn", "serverProductName",
>     "description", "administratorContactInfo", //"serverVersionNumber",
>-            "installationTimeStamp", "serverRoot", "serverHostName", };
>+            "installationTimeStamp", "serverHostName", };
> 
>     // attributes of objectclass nsApplication
>     static String _productDataKey[] = new String[]{ "nsProductName", //"description",
>                 "nsVendor", //"nsNickName",
>                 "nsProductVersion", "nsBuildNumber", "nsRevisionNumber",
>@@ -84,11 +84,11 @@
> 
>     static String _7bitDataKey[] = new String[]{ "serverProductName", };
> 
>     static String _displayDataKey[] = new String[]{ "serverProductName",
>     "description", //"serverVersionNumber",
>-            "installationTimeStamp", "serverRoot", "nsProductName",
>+            "installationTimeStamp", "nsProductName",
>     "nsVendor", "nsProductVersion", "nsBuildNumber", "nsRevisionNumber",
>     "nsBuildSecurity", };
> 
>     static String _nodeNameKey = "serverProductName";
> 
>Index: console/src/com/netscape/management/client/topology/AdminGroupNode.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/AdminGroupNode.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 AdminGroupNode.java
>--- console/src/com/netscape/management/client/topology/AdminGroupNode.java	18 Jul 2005 00:34:18 -0000	1.1.1.1
>+++ console/src/com/netscape/management/client/topology/AdminGroupNode.java	29 Jun 2007 17:52:45 -0000
>@@ -41,20 +41,18 @@
>  * @author   miodrag@netscape.com
>  * @author   ahakim@netscape.com
>  */
> public class AdminGroupNode extends ServerLocNode implements IMenuInfo,
> INodeInfo {
>-    private static final String MENU_MERGE = "MERGE";
>     private static final String MENU_OBJECT_CREATE_CATEGORY = "OBJECT_CREATE_CATEGORY";
>     private static final String MENU_CONTEXT_CREATE_CATEGORY = "CONTEXT_CREATE_CATEGORY";
> 
>     private boolean _enableCreateMenuCategory; // object specific state
> 
>     private InstalledProduct[]_installedProducts;
> 
>     private static RemoteImage _icon = null;
>-    private static ServerRootPromptDialog _serverRootPrompt = null;
>     private static ProductSelectionDialog _serverSelection = null;
>     private static ResourceSet _resource;
> 
>     private Vector _changeListeners = new Vector();
> 
>@@ -295,11 +293,10 @@
>             rpm.fireDisableMenuItem(viewInstance,
>                     MENU_OBJECT_CREATE_CATEGORY);
>             rpm.fireDisableMenuItem(viewInstance,
>                     MENU_CONTEXT_CREATE_CATEGORY);
>         }
>-        rpm.fireEnableMenuItem(viewInstance, MENU_MERGE);
>     }
> 
> 
>     /**
>       * set the admin server os type
>@@ -473,20 +470,16 @@
>       * @param category menu category
>       * @return the menu item for the given category
>       */
>     public IMenuItem[] getMenuItems(String category) {
>         if (category.equals(ResourcePage.MENU_OBJECT)) {
>-            return new IMenuItem[]{ new MenuItemText(MENU_MERGE,
>-                    _resource.getString("menu", "MergeConfig"), "",
>-                    true), new MenuItemCategory(
>+            return new IMenuItem[]{ new MenuItemCategory(
>                     MENU_OBJECT_CREATE_CATEGORY,
>                     _resource.getString("menu", "CreateServer"),
>                     _enableCreateMenuCategory)};
>         } else if (category.equals(ResourcePage.MENU_CONTEXT)) {
>-            return new IMenuItem[]{ new MenuItemText(MENU_MERGE,
>-                    _resource.getString("menu", "MergeConfig"), "",
>-                    true), new MenuItemCategory(
>+            return new IMenuItem[]{ new MenuItemCategory(
>                     MENU_CONTEXT_CREATE_CATEGORY,
>                     _resource.getString("menu", "CreateServer"),
>                     _enableCreateMenuCategory)};
>         } else if (category.equals(MENU_OBJECT_CREATE_CATEGORY) ||
>                 category.equals(MENU_CONTEXT_CREATE_CATEGORY)) {
>@@ -523,54 +516,47 @@
>       *
>       * @param viewInstance view instance of the console
>       * @param item menu item which is selected
>       */
>     public void actionMenuSelected(IPage viewInstance, IMenuItem item) {
>-        if (item.getID().equals(MENU_MERGE)) {
>-            MergeConfigDialog d =
>-                    new MergeConfigDialog(getDN(), _consoleInfo, this,
>-                    viewInstance);
>-            d.show();
>-        } else {
>-            // Check if create a new server instance was selected.
>-            if (_installedProducts != null) {
>-                for (int i = 0; i < _installedProducts.length; i++) {
>-                    if (item.getID().equals(
>-                            _installedProducts[i].getNickname())) {
>-                        Class c = ClassLoaderUtil.getClass(_consoleInfo,
>-                                _installedProducts[i]
>-                                .getCreationClassName());
>-                        if (c != null) {
>-                            try {
>-                                IProductObject productHandle =
>-                                        (IProductObject) c.newInstance();
>-                                productHandle.initialize(
>-                                        (ConsoleInfo)_consoleInfo.clone());
>-                                CreateThread thread =
>-                                        new CreateThread(_consoleInfo,
>-                                        viewInstance, getDN(),
>-                                        productHandle, _resource);
>-                                thread.start();
>-                            } catch (Exception e) {
>-                                SuiOptionPane.showMessageDialog(
>-                                        _consoleInfo.getFrame(),
>-                                        MessageFormat.format(
>-                                        _resource.getString("ServerRootPromptDialog",
>-                                        "couldNotInstantiate"),
>-                                        new Object[]{c.getName(), e}),
>-                                        _resource.getString("ServerRootPromptDialog",
>-                                        "CreateTitle"),
>-                                        SuiOptionPane.ERROR_MESSAGE);
>-                                ModalDialogUtil.sleep();
>-                                ModalDialogUtil.raise(
>-                                        viewInstance.getFramework().
>-                                        getJFrame());
>-                                return;
>-                            }
>+        // Check if create a new server instance was selected.
>+        if (_installedProducts != null) {
>+            for (int i = 0; i < _installedProducts.length; i++) {
>+                if (item.getID().equals(
>+                        _installedProducts[i].getNickname())) {
>+                    Class c = ClassLoaderUtil.getClass(_consoleInfo,
>+                            _installedProducts[i]
>+                            .getCreationClassName());
>+                    if (c != null) {
>+                        try {
>+                            IProductObject productHandle =
>+                                    (IProductObject) c.newInstance();
>+                            productHandle.initialize(
>+                                    (ConsoleInfo)_consoleInfo.clone());
>+                            CreateThread thread =
>+                                    new CreateThread(_consoleInfo,
>+                                    viewInstance, getDN(),
>+                                    productHandle, _resource);
>+                            thread.start();
>+                        } catch (Exception e) {
>+                            SuiOptionPane.showMessageDialog(
>+                                    _consoleInfo.getFrame(),
>+                                    MessageFormat.format(
>+                                    _resource.getString("ServerPromptDialog",
>+                                    "couldNotInstantiate"),
>+                                    new Object[]{c.getName(), e}),
>+                                    _resource.getString("ServerPromptDialog",
>+                                    "CreateTitle"),
>+                                    SuiOptionPane.ERROR_MESSAGE);
>+                            ModalDialogUtil.sleep();
>+                            ModalDialogUtil.raise(
>+                                    viewInstance.getFramework().
>+                                    getJFrame());
>+                            return;
>                         }
>-                        break; // Only one instance can be created at a time...
>                     }
>+                    break; // Only one instance can be created at a time...
>                 }
>             }
>         }
>     }
> 
>Index: console/src/com/netscape/management/client/topology/TopologyInitializer.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/TopologyInitializer.java,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 TopologyInitializer.java
>--- console/src/com/netscape/management/client/topology/TopologyInitializer.java	13 Jun 2007 20:33:11 -0000	1.2
>+++ console/src/com/netscape/management/client/topology/TopologyInitializer.java	29 Jun 2007 17:52:45 -0000
>@@ -60,11 +60,11 @@
>     public TopologyInitializer(ConsoleInfo info) {
>         super();
> 
>         consoleInfo = info;
> 
>-        setFrameTitle(new ResourceSet("com.netscape.management.client.console.console").getString("console", "title"));  // not localized because it is product name
>+        setFrameTitle(new ResourceSet("com.netscape.management.client.theme.theme").getString("console", "title"));  // not localized because it is product name
>         setMinimizedImage( new RemoteImage("com/netscape/management/client/theme/images/logo16.gif").getImage());
>         setBannerImage( new RemoteImage("com/netscape/management/client/theme/images/ConsoleBanner.gif").getImage());
> 
>         uip = new UIPermissions(LDAPUtil.getAdminGlobalParameterEntry());
>         uip.addPermission(PERMID_UGTAB, getPermString("UGTabName"), getPermString("UGTabDesc"));
>Index: console/src/com/netscape/management/client/topology/topology.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/topology.properties,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 topology.properties
>--- console/src/com/netscape/management/client/topology/topology.properties	26 Oct 2005 23:16:23 -0000	1.2
>+++ console/src/com/netscape/management/client/topology/topology.properties	29 Jun 2007 17:52:46 -0000
>@@ -44,17 +44,15 @@
> menu-CreateServer=&Create Instance Of
> menu-RemoveServer=Remove Server
> menu-CloneServer=Clone Server Config...
> menu-Customize=Customize...
> menu-LicenseTracking=&Track Licenses
>-menu-MergeConfig=Merge Config...
> menu-refresh=Re&fresh
> menu-ChangeDirectory=C&hange Directory...
> menu-Security=Security
> menu-manageCert=&Manage Certificates
> menu-migrateKeyCert=&Migrate Certificate data from...
>-menu-MergeConfig=M&erge Configuration...
> menu-open=&Open
> menuCategory-User=&User
> menu-CreateButton=&Create
> menu-Delete=&Delete
> menu-Edit=&Edit...
>@@ -207,30 +205,13 @@
> ProductSelectionDialog-CreatePrompt=Select one or more products to create an instance of:
> ProductSelectionDialog-CreateButtonLabel=Create
> ProductSelectionDialog-CreateHelpToken=topology-productselectiondialog-create
> topology-psd-create=admin
> 
>-KeyCertMigrationDialog-Title=Migrate keys and certificates
>-KeyCertMigrationDialog-from=Migrate key and certificate from:
>-KeyCertMigrationDialog-oldServerRoot=Server root:
>-KeyCertMigrationDialog-alias=Alias:
>-KeyCertMigrationDialog-oldServerVer=Server version:
>-KeyCertMigrationDialog-to=Migrate key and certificate to:
>-KeyCertMigrationDialog-sie=Server ID:
>-KeyCertMigrationDialog-pwd=Password:
>-KeyCertMigrationDialog-fail=Key and certificate migration fail
>-topology-kcmd=admin
>-
>-ServerRootPromptDialog-Title=Migrate Server Configuration
>-ServerRootPromptDialog-CreateTitle=Create Server Instance
>-ServerRootPromptDialog-okayToOverwrite=Is it okay to overwrite the existing SIE during the migration of {0}?
>-ServerRootPromptDialog-couldNotInstantiate=Could not instantiate class: {0}\n\nException: {1}
>-ServerRootPromptDialog-Prompt=Specify the server root path to migrate from.
>-ServerRootPromptDialog-PromptDetail=** The server root must be accessible to the Administration Server.
>-ServerRootPromptDialog-TextFieldLabel=Directory:
>-ServerRootPromptDialog-FindButtonLabel=Find Servers
>-topology-srpd=admin
>+ServerPromptDialog-CreateTitle=Create Server Instance
>+ServerPromptDialog-couldNotInstantiate=Could not instantiate class: {0}\n\nException: {1}
>+topology-spd=admin
> 
> OUPickerDialog-Title=Select Organizational Unit
> OUPickerDialog-Prompt=Select the directory subtree in which to create the new entry:
> OUPickerDialog-SearchFilter=(objectclass=organizationalunit)
> OUPickerDialog-BaseDNString=Base DN (top level of the Users and Groups tree)
>@@ -280,11 +261,10 @@
> #
> # right hand panel, common to all server instances
> #
> ServerObject-nsAdminGroupName=Group name
> ServerObject-description=Description
>-ServerObject-serverRoot=Server root
> ServerObject-serverProductName=Server name
> ServerObject-serverVersionNumber=Version
> ServerObject-installationTimeStamp=Installation date
> ServerObject-administratorContactInfo=Contact information
> ServerObject-serverHostName=Host name
>@@ -303,21 +283,10 @@
> NewDomain-NullConnection=No directory server connection.
> NewDomain-FailToCreate=Fail to create network domain.
> NewDomain-ownerDN=Owner DN:
> topology-NewDomain=admin
> 
>-MergeConfig-title=Merge Configuration Directory Server Information
>-MergeConfig-MergeWarning=Warning: Be sure to back up your Destination Config DS before continuing!
>-MergeConfig-DestDomain=Destination Domain:
>-MergeConfig-DestHost=Destination LDAP Host:
>-MergeConfig-DestPort=Destination LDAP Port:
>-MergeConfig-DestBindDN=Destination LDAP Bind DN:
>-MergeConfig-DestBindPW=Destination LDAP Bind Password:
>-MergeConfig-Success=All configuration data has been merged and the server instances now use the destination Configuration Directory Server.\nPlease restart the Admin Server and Console for changes to take effect.
>-MergeConfig-UpdateFailure=Error: At least one server's CGI failed while updating its local config data.
>-topology-MergeConfig=admin
>-
> customview-EditView=Edit View
> customview-DefaultView=Default View
> customview-RemoveView= &Remove
> customview-removeView_tt=Remove the selected item from the custom view
> customview-Copy=C&opy 
>Index: console/src/com/netscape/management/client/topology/customview/CustomView.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/customview/CustomView.java,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 CustomView.java
>--- console/src/com/netscape/management/client/topology/customview/CustomView.java	8 Feb 2006 22:13:24 -0000	1.2
>+++ console/src/com/netscape/management/client/topology/customview/CustomView.java	29 Jun 2007 17:52:46 -0000
>@@ -470,11 +470,11 @@
>      */
>     void addDynamicNodes(ResourceObject parent, LDAPUrl url) {
>         LDAPSearchResults result = null;
>         try {
>             result = _ldc.search(url.getDN().trim(), url.getScope(),
>-                                 url.getFilter().trim(), new String[] {"1.1"}, false);
>+                                 url.getFilter().trim(), new String[] {"1.1.0"}, false);
>             while (result != null && result.hasMoreElements()) {
>                 LDAPEntry rscEntry = (LDAPEntry) result.next();
>                 ResourceObject rscObj = getTopologyResource(rscEntry.getDN());
>                 if (rscObj != null) {
>                     parent.add(rscObj);
>Index: console/src/com/netscape/management/client/util/RemoteImage.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/RemoteImage.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 RemoteImage.java
>--- console/src/com/netscape/management/client/util/RemoteImage.java	18 Jul 2005 00:34:27 -0000	1.1.1.1
>+++ console/src/com/netscape/management/client/util/RemoteImage.java	29 Jun 2007 17:52:46 -0000
>@@ -158,11 +158,11 @@
>             image = (RemoteImage) loaderCache.get(path);
>         }
>         if (Debug.getTraceLevel() == 9) {
>             Debug.println(9,
>                     "RemoteImage: " + ((image == null) ? "NOT ":"") +
>-                    "found " + loaderName + ":"+path);
>+                    "found in cache " + loaderName + ":"+path);
>         }
>         return image;
>     }
> 
>     private void putInCache(String path, RemoteImage image) {
>Index: console/src/com/netscape/management/client/util/ResourceSet.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/ResourceSet.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 ResourceSet.java
>--- console/src/com/netscape/management/client/util/ResourceSet.java	18 Jul 2005 00:34:27 -0000	1.1.1.1
>+++ console/src/com/netscape/management/client/util/ResourceSet.java	29 Jun 2007 17:52:46 -0000
>@@ -254,11 +254,11 @@
>             prb = (PropertyResourceBundle) loaderCache.get(bundle);
>         }
>         if (Debug.getTraceLevel() == 9) {
>             Debug.println(9,
>                     "ResourceSet: " + ((prb == null) ? "NOT ":"") +
>-                    "found " + loaderName + ":"+bundle);
>+                    "found in cache " + loaderName + ":"+bundle);
>         }
>         return prb;
>     }
> 
>     private void putInCache(String bundle, PropertyResourceBundle prb) {

Actions: View | Diff

Attachments on bug 246270: 158240 | 158263 | 158277 | 158363