Attachment 158277 Details for Bug 246270 – Additional Diffs

[patch] Additional Diffs

diffs.txt (text/plain), 9.12 KB, created by Nathan Kinder on 2007-06-29 22:49:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-06-29 22:49:41 UTC

Size: 9.12 KB

patch

obsolete

>Index: src/com/netscape/management/client/Framework.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/Framework.java,v
>retrieving revision 1.3
>diff -u -5 -t -r1.3 Framework.java
>--- src/com/netscape/management/client/Framework.java	29 Jun 2007 20:32:27 -0000	1.3
>+++ src/com/netscape/management/client/Framework.java	29 Jun 2007 22:45:38 -0000
>@@ -209,11 +209,12 @@
>                 BorderFactory.createEmptyBorder(2, HORIZ_WINDOW_INSET,
>                 2, HORIZ_WINDOW_INSET));
> 
>         _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));
> 
>         _pagePanel = new JPanel();
>         _pagePanel.setLayout(new BorderLayout());
>Index: src/com/netscape/management/client/FrameworkInitializer.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/FrameworkInitializer.java,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 FrameworkInitializer.java
>--- src/com/netscape/management/client/FrameworkInitializer.java	29 Jun 2007 20:32:27 -0000	1.2
>+++ src/com/netscape/management/client/FrameworkInitializer.java	29 Jun 2007 22:45:38 -0000
>@@ -262,11 +262,11 @@
>             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,
>                         themeResource.getString("defaultAbout",
>-                        "dialogTitle"));
>+                        "dialogTitle") + " " + VersionInfo.getVersionNumber());
>                 aboutDialog.setProduct( new RemoteImage(
>                         themeResource.getString("defaultAbout",
>                         "productLogo")),
>                         aboutDialogResource.getString("defaultAbout",
>                         "productCopyright"),
>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.9
>diff -u -5 -t -r1.9 Console.java
>--- src/com/netscape/management/client/console/Console.java	29 Jun 2007 20:32:28 -0000	1.9
>+++ src/com/netscape/management/client/console/Console.java	29 Jun 2007 22:45:39 -0000
>@@ -54,12 +54,12 @@
> 
>     //
>     // 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";
> 
>     public static final String PREFERENCE_UID = "UserID";
>     public static final String PREFERENCE_REMEMBER_UID =
>@@ -1557,12 +1557,12 @@
>             }
>         }
> 
>         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');
>             boolean supportedOption = false;
> 
>Index: src/com/netscape/management/client/console/VersionInfo.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/VersionInfo.java,v
>retrieving revision 1.3
>diff -u -5 -t -r1.3 VersionInfo.java
>--- src/com/netscape/management/client/console/VersionInfo.java	24 Mar 2006 19:05:37 -0000	1.3
>+++ src/com/netscape/management/client/console/VersionInfo.java	29 Jun 2007 22:45:39 -0000
>@@ -35,10 +35,19 @@
>      * Returns version number for the Console.
>      *
>      * @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");
>     }
> 
>     /**
>       * Returns build number for the Console.
>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.7
>diff -u -5 -t -r1.7 console.properties
>--- src/com/netscape/management/client/console/console.properties	29 Jun 2007 20:32:28 -0000	1.7
>+++ src/com/netscape/management/client/console/console.properties	29 Jun 2007 22:45:39 -0000
>@@ -15,18 +15,14 @@
> # 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
> #
>-#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
> 
> restart-title=Restart Directory Server
>Index: src/com/netscape/management/client/console/genverinfo.sh
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/genverinfo.sh,v
>retrieving revision 1.3
>diff -u -5 -t -r1.3 genverinfo.sh
>--- src/com/netscape/management/client/console/genverinfo.sh	24 Mar 2006 19:05:38 -0000	1.3
>+++ src/com/netscape/management/client/console/genverinfo.sh	29 Jun 2007 22:45:39 -0000
>@@ -32,8 +32,8 @@
>         echo Usage: $0 outputFile versionNumber majorVersionNumber buildNumberFile
>         exit  1
> 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
>Index: 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.2
>diff -u -5 -t -r1.2 theme.properties
>--- src/com/netscape/management/client/theme/theme.properties	29 Jun 2007 20:32:28 -0000	1.2
>+++ src/com/netscape/management/client/theme/theme.properties	29 Jun 2007 22:45:40 -0000
>@@ -19,13 +19,13 @@
> #
> 
> 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.
> 
> CertInstallTypePage-defaultServerName=Fedora Server
> CertInstallTypePage-defaultSIE=Fedora Server Instance
>Index: 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.3
>diff -u -5 -t -r1.3 CustomView.java
>--- src/com/netscape/management/client/topology/customview/CustomView.java	29 Jun 2007 20:32:29 -0000	1.3
>+++ src/com/netscape/management/client/topology/customview/CustomView.java	29 Jun 2007 22:45:40 -0000
>@@ -470,11 +470,12 @@
>      */
>     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.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());
>                 if (rscObj != null) {
>                     parent.add(rscObj);

Actions: View | Diff

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