Created attachment 120508 [details]
CVS Diffs

Adjusted the version number and branding.  I had to modify the checkVersion
method to deal with running in Console 1.0.  I also cleaned up references to
"consolesdk" in the Ant build files.  They should be "console" instead since we
dropped the "consolesdk" naming.

Created attachment 120511 [details]
CVS Commit

Checked into HEAD.  Reviewed by Noriko.

Noriko and I noticed an additional change that is needed for the checkVersion
method.  Here's the change:

Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.2
diff -u -5 -t -r1.2 DSAdmin.java
--- DSAdmin.java        28 Oct 2005 18:01:34 -0000      1.2
+++ DSAdmin.java        28 Oct 2005 22:15:57 -0000
@@ -1234,11 +1234,11 @@
                 version = VersionInfo.getVersionNumber();
  
                 try {
                         Float f = new Float(version);
                         // Check if the console meets the minimum version
requirement
-                        if ((f != null) && (f.floatValue() > MINIMUM_VERSION)) {
+                        if ((f != null) && (f.floatValue() >= MINIMUM_VERSION)) {
                                 return true;
                         } else {
                                 DSUtil.showErrorDialog(frame, "neednewconsole",
version);

Additional checkVersion change checked into HEAD.  Reviewed by Noriko (thanks!).

Checking in DSAdmin.java;
/cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v  <--
 DSAdmin.java
new revision: 1.3; previous revision: 1.2
done

Please add steps to reproduce and verify thanks

1) run the console
2) open the About... window
3) should report correct version - corresponds to the rpm version

[root@testvm /]# rpm -qa | grep 389
389-adminutil-1.1.13-1.el6.x86_64
389-console-1.1.4-1.el6.noarch
389-ds-console-doc-1.2.5-1.el6.noarch
389-ds-base-1.2.8.2-1.el6.x86_64
389-admin-1.1.16-2.el6.x86_64
389-ds-console-1.2.5-1.el6.noarch
389-admin-console-doc-1.1.7-1.el6.noarch
389-ds-base-debuginfo-1.2.8.2-1.el6.x86_64
389-ds-base-libs-1.2.8.2-1.el6.x86_64
389-admin-console-1.1.7-1.el6.noarch
389-ds-1.2.1-2.el6.noarch

On Console 1.2.0


Hence VERIFIED.