Attachment 156890 Details for Bug 244051 – comment #2: review?

comment #2: review?

console.cvsdiff (text/plain), 10.61 KB, created by Christina Fu on 2007-06-13 15:58:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christina Fu

Created: 2007-06-13 15:58:33 UTC

Size: 10.61 KB

patch

obsolete

>? console.cvsdiff
>? src/com/netscape/management/cscope.files
>? src/com/netscape/management/cscope.out
>? src/com/netscape/management/img.files
>? src/com/netscape/management/client/theme
>? src/com/netscape/management/client/console/versioninfo.properties
>Index: build.properties
>===================================================================
>RCS file: /cvs/dirsec/console/build.properties,v
>retrieving revision 1.9
>diff -r1.9 build.properties
>41a42,45
>> 
>> theme.core=${console.brand}-theme
>> theme.name=${theme.core}-${console.dotversion}
>> theme.gen.name=${theme.core}-${console.dotgenversion}
>Index: build.xml
>===================================================================
>RCS file: /cvs/dirsec/console/build.xml,v
>retrieving revision 1.12
>diff -r1.12 build.xml
>215a216,221
>>          <exclude name="com/netscape/management/client/theme/**" />
>>       </fileset>
>>     </jar>
>>     <jar jarfile="${built.jardir}/${theme.name}_${lang}.jar" >
>>       <fileset dir="${java.src.dir}">
>>          <include name="com/netscape/management/client/theme/**" />
>257a264
>>     <copy file="${built.jardir}/${theme.name}_${lang}.jar" todir="${java.dir}"/>
>268a276,278
>>       <arg line="-s ${theme.name}_${lang}.jar ${theme.gen.name}_${lang}.jar"/>
>>     </exec>
>>     <exec executable="ln" dir="${java.dir}" vmlauncher="true">
>Index: startconsole
>===================================================================
>RCS file: /cvs/dirsec/console/startconsole,v
>retrieving revision 1.5
>diff -r1.5 startconsole
>28a29
>> THEME_JAR=/usr/share/java/fedora-theme-1.0.3_en.jar
>32c33
>< java -ms8m -mx64m -cp /usr/share/java/jss3.jar:/usr/share/java/ldapjdk.jar:/usr/share/java/fedora-base-1.0.jar:/usr/share/java/fedora-mcc-1.0.jar:/usr/share/java/fedora-mcc-1.0_en.jar:/usr/share/java/fedora-nmclf-1.0.jar:/usr/share/java/fedora-nmclf-1.0_en.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 /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 $*
>Index: src/com/netscape/management/client/default.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
>retrieving revision 1.5
>diff -r1.5 default.properties
>126c126
>< banner-console=Fedora Management Console 1.0.3
>---
>> #banner-console=Fedora Management Console 1.0.3
>Index: src/com/netscape/management/client/defaultLicense.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/defaultLicense.properties,v
>retrieving revision 1.5
>diff -r1.5 defaultLicense.properties
>20,21c20,21
>< defaultAbout-dialogTitle=Fedora Management Console 1.0.3
>< defaultAbout-productLogo=com/netscape/management/client/images/logo32.gif
>---
>> #defaultAbout-dialogTitle=Fedora Management Console 1.0.3
>> #defaultAbout-productLogo=com/netscape/management/client/images/logo32.gif
>23c23
>< defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
>---
>> #defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
>Index: src/com/netscape/management/client/comm/HttpChannel.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/comm/HttpChannel.java,v
>retrieving revision 1.1.1.1
>diff -r1.1.1.1 HttpChannel.java
>40a41
>> import com.netscape.management.client.util.*;
>62a64,65
>>     public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
>> 
>274c277,278
><             writeLine("User-Agent: Fedora-Management-Console/" + consoleVersion);
>---
>>             writeLine("User-Agent: "+
>>                 _resource_theme.getString("console","useragent")+ "/" + consoleVersion);
>276c280,281
><             writeLine("User-Agent: Fedora-Management-Console/");
>---
>>             writeLine("User-Agent:"+
>>                 _resource_theme.getString("console","useragent")+ "/");
>Index: src/com/netscape/management/client/comm/HttpsChannel.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/comm/HttpsChannel.java,v
>retrieving revision 1.2
>diff -r1.2 HttpsChannel.java
>131c131
><             _frame.setIconImage( new RemoteImage("com/netscape/management/client/images/logo16.gif").getImage());
>---
>>             _frame.setIconImage( new RemoteImage("com/netscape/management/client/themed/images/logo16.gif").getImage());
>Index: 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.7
>diff -r1.7 Console.java
>87a88
>>     public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.console");
>530c531
><         _frame.setIconImage( new RemoteImage("com/netscape/management/client/images/logo16.gif").getImage());
>---
>>         _frame.setIconImage( new RemoteImage("com/netscape/management/client/theme/images/logo16.gif").getImage());
>1560c1561
><                 "Fedora-Management-Console/" +
>---
>>                 _resource_theme.getString("console","useragent")+"/" +
>Index: 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.5
>diff -r1.5 console.properties
>20c20,21
>< console-title=Fedora Management Console
>---
>> #console-title=Fedora Management Console
>> #console-useragent=Fedora-Management-Console
>26,27c27,28
>< login-title=Fedora Management Console Login
>< login-copyright=Copyright (C) 2005 Fedora Project
>---
>> #login-title=Fedora Management Console Login
>> login-copyright=Copyright (C) Red Hat, Inc.
>69c70
>< ClassLoadingDlg-text=New java class files are available. In order to have\nall the new features for the Fedora Management Console, you need to download the following class files.\nDo you want to do it now?
>---
>> ClassLoadingDlg-text=New java class files are available. In order to have\nall the new features for the console, you need to download the following class files.\nDo you want to do it now?
>Index: src/com/netscape/management/client/security/CertInstallTypePage.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertInstallTypePage.java,v
>retrieving revision 1.1.1.1
>diff -r1.1.1.1 CertInstallTypePage.java
>33a34
>>     ResourceSet resource_theme = KeyCertUtility.getResourceSetTheme();
>37c38
><         forServer.setText((String)(dataModel.getValue("serverType", resource.getString("CertInstallTypePage", "defaultServerName"))) +
>---
>>         forServer.setText((String)(dataModel.getValue("serverType", resource_theme.getString("CertInstallTypePage", "defaultServerName"))) +
>39c40
><                           (String)(dataModel.getValue("sie", resource.getString("CertInstallTypePage", "defaultSIE"))) +
>---
>>                           (String)(dataModel.getValue("sie", resource_theme.getString("CertInstallTypePage", "defaultSIE"))) +
>Index: src/com/netscape/management/client/security/KeyCertUtility.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/KeyCertUtility.java,v
>retrieving revision 1.1.1.1
>diff -r1.1.1.1 KeyCertUtility.java
>50a51,60
>>     static ResourceSet _resource_theme = null;
>>     public static ResourceSet getResourceSetTheme() {
>>         if (_resource_theme == null) {
>>             _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
>> 
>>         }
>> 
>>         return _resource_theme;
>>     }
>> 
>Index: src/com/netscape/management/client/security/KeyCertWizardResource.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/KeyCertWizardResource.properties,v
>retrieving revision 1.1.1.1
>diff -r1.1.1.1 KeyCertWizardResource.properties
>33c33
>< CertMigrateAliasSelectionPage-explain=The Fedora server contains one or more certificate aliases
>---
>> CertMigrateAliasSelectionPage-explain=The server contains one or more certificate aliases
>161,162c161,162
>< CertInstallTypePage-defaultServerName=Fedora Server
>< CertInstallTypePage-defaultSIE=Fedora Server Instance
>---
>> #CertInstallTypePage-defaultServerName=Fedora Server
>> #CertInstallTypePage-defaultSIE=Fedora Server Instance
>Index: 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.1.1.1
>diff -r1.1.1.1 TopologyInitializer.java
>65,67c65,67
><         setFrameTitle("Fedora Management Console");  // not localized because it is product name
><         setMinimizedImage( new RemoteImage("com/netscape/management/client/images/logo16.gif").getImage());
><         setBannerImage( new RemoteImage("com/netscape/management/client/images/ConsoleBanner.gif").getImage());
>---
>>         setFrameTitle(new ResourceSet("com.netscape.management.client.console.console").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());
>Index: src/com/netscape/management/client/ug/PickerEditorResource.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/ug/PickerEditorResource.properties,v
>retrieving revision 1.1.1.1
>diff -r1.1.1.1 PickerEditorResource.properties
>380c380
>< CALPage-Title2=this user has been granted a license for any of the following Fedora products.
>---
>> CALPage-Title2=this user has been granted a license for any of the following products.

Actions: View

Attachments on bug 244051: 156890 | 156891