From 6cd96fa03ca417415d6e91359241dc569efd3b59 Mon Sep 17 00:00:00 2001
From: fguigues <fguigues@localhost>
Date: Mon, 14 Sep 2009 13:20:20 +0000
Subject: [PATCH] Fixes
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 5 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java | 2
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 22 ++++-
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java | 4
opendj-sdk/opends/resource/servicetag/opends.uuids.properties | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java | 11 +-
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java | 4
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java | 6 +
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericFrame.java | 2
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 4
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java | 6 +
opendj-sdk/opends/src/messages/messages/admin_tool.properties | 6
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 4
opendj-sdk/opends/resource/DynamicConstants.java.stubs | 60 ++++++++++++++
opendj-sdk/opends/src/messages/messages/quicksetup.properties | 35 +++-----
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java | 4
opendj-sdk/opends/PRODUCT | 15 +++
19 files changed, 151 insertions(+), 53 deletions(-)
diff --git a/opendj-sdk/opends/PRODUCT b/opendj-sdk/opends/PRODUCT
index a9e61b3..3228637 100644
--- a/opendj-sdk/opends/PRODUCT
+++ b/opendj-sdk/opends/PRODUCT
@@ -13,6 +13,21 @@
# The point version number for the Directory Server. It must be an integer.
POINT_VERSION=0
+# The product reference site
+DOC_REFERENCE_HOME=http://opends.org
+
+# The product documentation set reference
+DOC_REFERENCE_WIKI=https://docs.opends.org/2.2/page/Main
+
+# The setup document reference site
+DOC_REFERENCE_SETUP=https://docs.opends.org/2.2/page/InstallationGuide
+
+# The Quick reference guide documentation set reference
+DOC_QUICK_REFERENCE_GUIDE=https://docs.opends.org/2.2/page/AdministrationGuide
+
+# The Administration Guide reference
+ADMINISTRATION_GUIDE_URL=https://docs.opends.org/2.2/page/AdministrationGuide
+
# The version qualifier string for the Directory Server. It should be blank
# for the first official release with a new major, minor, and point version
# number but may include additional text like "BETA1" or "HOTFIX2" for updates
diff --git a/opendj-sdk/opends/resource/DynamicConstants.java.stubs b/opendj-sdk/opends/resource/DynamicConstants.java.stubs
index c64e4d4..aefc29e 100644
--- a/opendj-sdk/opends/resource/DynamicConstants.java.stubs
+++ b/opendj-sdk/opends/resource/DynamicConstants.java.stubs
@@ -130,7 +130,31 @@
* The Subversion url repository location on which this build is based.
*/
public static String URL_REPOSITORY =
- "${URL_REPOSITORY}";
+ "${URL_REPOSITORY}";
+
+ /**
+ * The documentation home.
+ */
+ public static String DOC_REFERENCE_HOME =
+ "${DOC_REFERENCE_HOME}";
+
+ /**
+ * The documentation url.
+ */
+ public static String DOC_REFERENCE_WIKI =
+ "${DOC_REFERENCE_WIKI}";
+
+ /**
+ * The documentation url.
+ */
+ public static String DOC_QUICK_REFERENCE_GUIDE =
+ "${DOC_QUICK_REFERENCE_GUIDE}";
+
+ /**
+ * The administration guide.
+ */
+ public static String ADMINISTRATION_GUIDE_URL =
+ "${ADMINISTRATION_GUIDE_URL}";
/**
* Indicates wheater this build includes AspectJ weaving for the debug logging
@@ -144,6 +168,17 @@
public static String VERSION_NUMBER_STRING =
"${VERSION_NUMBER_STRING}";
+ /**
+ * A string representation of the version number.
+ */
+ public static String OPENDS_NUMBER_STRING =
+ "${VERSION_NUMBER_STRING}";
+
+ /**
+ * A string representation of the release version.
+ */
+ public static String RELEASE_VERSION_STRING =
+ OPENDS_NUMBER_STRING;
/**
@@ -246,6 +281,21 @@
}
catch (Exception ex) {}
try{
+ DOC_REFERENCE_WIKI =
+ (String)c.getField("DOC_REFERENCE_WIKI").get(obj);
+ }
+ catch(Exception ex) {}
+ try{
+ DOC_QUICK_REFERENCE_GUIDE =
+ (String)c.getField("DOC_QUICK_REFERENCE_GUIDE").get(obj);
+ }
+ catch(Exception ex) {}
+ try{
+ ADMINISTRATION_GUIDE_URL =
+ (String)c.getField("ADMINISTRATION_GUIDE_URL").get(obj);
+ }
+ catch(Exception ex) {}
+ try{
WEAVE_ENABLED = (Boolean)c.getField("WEAVE_ENABLED").get(obj);
}
catch (Exception ex) {}
@@ -254,6 +304,12 @@
(String)c.getField("VERSION_NUMBER_STRING").get(obj);
}
catch (Exception ex) {}
+ try{
+ RELEASE_VERSION_STRING = VERSION_NUMBER_STRING
+ + " (OpenDS version = "
+ + OPENDS_NUMBER_STRING + ")" ;
+ }
+ catch (Exception ex) {}
} catch (Exception ex) {
}
}
@@ -268,7 +324,7 @@
* A full version string for this product.
*/
public static String FULL_VERSION_STRING =
- PRODUCT_NAME + " " + VERSION_NUMBER_STRING +
+ PRODUCT_NAME + " " + RELEASE_VERSION_STRING +
(((FIX_IDS != null) && (FIX_IDS.length() > 0))
? "+" + FIX_IDS
: "");
diff --git a/opendj-sdk/opends/resource/servicetag/opends.uuids.properties b/opendj-sdk/opends/resource/servicetag/opends.uuids.properties
index 228d047..d70e030 100644
--- a/opendj-sdk/opends/resource/servicetag/opends.uuids.properties
+++ b/opendj-sdk/opends/resource/servicetag/opends.uuids.properties
@@ -1,6 +1,6 @@
-org.opends.server.servicetag.productname=OpenDS 2.0
-org.opends.server.servicetag.version=2.0
-org.opends.server.servicetag.uuid=urn:uuid:be69303a-a1da-11dd-a2a2-080020a9ed93
+org.opends.server.servicetag.productname=OpenDS 2.2
+org.opends.server.servicetag.version=2.2
+org.opends.server.servicetag.uuid=urn:uuid:03abeb3a-9cd1-11de-9d26-080020a9ed93
org.opends.server.servicetag.parent=Unknown
org.opends.server.servicetag.parenturn=Unknown
org.opends.server.servicetag.vendor=Opends.org
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
index e87ce47..a3a35c2 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
@@ -44,6 +44,7 @@
import org.opends.quicksetup.Installation;
import org.opends.messages.Message;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.util.DynamicConstants;
/**
* The class that is in charge of creating the main dialog of the ControlPanel
@@ -132,7 +133,8 @@
dlg.setJMenuBar(menuBar);
String title = Utils.getCustomizedObject(
"INFO_CONTROL_PANEL_TITLE",
- AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get(),
+ AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get(
+ DynamicConstants.PRODUCT_NAME),
Message.class).toString();
dlg.setTitle(title);
dlg.setContentPane(controlCenterPane);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index c65710e..1c741b1 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -44,6 +44,7 @@
import org.opends.messages.Message;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.util.DynamicConstants;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.args.ArgumentException;
@@ -238,7 +239,8 @@
{
// Setup MacOSX native menu bar before AWT is loaded.
Message title = Utils.getCustomizedObject("INFO_CONTROL_PANEL_TITLE",
- AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get(), Message.class);
+ AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get(
+ DynamicConstants.PRODUCT_NAME), Message.class);
Utils.setMacOSXMenuBar(title);
if (SwingUtilities.isEventDispatchThread())
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
index db0b982..b0c439d 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
@@ -64,6 +64,7 @@
import javax.swing.text.JTextComponent;
import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.server.util.DynamicConstants;
/**
* The generic dialog of the Control Panel. It contains a StatusGenericPanel.
@@ -283,6 +284,7 @@
if (panel.getTitle() != null)
{
setTitle(INFO_CTRL_PANEL_GENERIC_TITLE.get(
+ DynamicConstants.PRODUCT_NAME,
panel.getTitle().toString()).toString());
}
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericFrame.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericFrame.java
index e939335..dbcd9d4 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericFrame.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericFrame.java
@@ -64,6 +64,7 @@
import org.opends.guitools.controlpanel.ui.GenericDialog.ButtonType;
import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.server.util.DynamicConstants;
/**
* The generic frame of the Control Panel. It contains a StatusGenericPanel.
@@ -258,6 +259,7 @@
if (panel.getTitle() != null)
{
setTitle(INFO_CTRL_PANEL_GENERIC_TITLE.get(
+ DynamicConstants.PRODUCT_NAME,
panel.getTitle().toString()).toString());
}
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
index df64d8a..5ae3e89 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
@@ -44,6 +44,7 @@
import org.opends.quicksetup.util.Utils;
import org.opends.quicksetup.util.WebBrowserException;
import org.opends.quicksetup.util.WebBrowserLauncher;
+import org.opends.server.util.DynamicConstants;
/**
* An abstract class that the different menu bars in the Control Panel extend.
@@ -59,14 +60,14 @@
*/
protected final String ADMINISTRATION_GUIDE_URL =
Utils.getCustomizedObject("ADMINISTRATION_GUIDE_URL",
- "https://www.opends.org/wiki/page/AdministrationGuide", String.class);
+ DynamicConstants.ADMINISTRATION_GUIDE_URL, String.class);
/**
* The URL to the wiki main page.
*/
- protected final String WIKI_MAIN_PAGE_URL =
- Utils.getCustomizedObject("WIKI_MAIN_PAGE_URL",
- "https://www.opends.org/wiki/page/Main", String.class);
+ protected final String DOC_REFERENCE_WIKI =
+ Utils.getCustomizedObject("DOC_REFERENCE_WIKI",
+ DynamicConstants.DOC_REFERENCE_WIKI, String.class);
/**
* Constructor of the menu bar.
@@ -111,7 +112,7 @@
{
public void actionPerformed(ActionEvent ev)
{
- displayURL(WIKI_MAIN_PAGE_URL);
+ displayURL(DOC_REFERENCE_WIKI);
}
});
menu.add(menuItem);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
index 1d90a7b..3d0f9e6 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -41,6 +41,7 @@
import org.opends.quicksetup.QuickSetupLog;
import org.opends.quicksetup.ReturnCode;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.util.DynamicConstants;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
@@ -203,7 +204,8 @@
*/
protected Message getFrameTitle() {
Message title = Utils.getCustomizedObject("INFO_FRAME_UNINSTALL_TITLE",
- INFO_FRAME_UNINSTALL_TITLE.get(), Message.class);
+ INFO_FRAME_UNINSTALL_TITLE.get(
+ DynamicConstants.PRODUCT_NAME), Message.class);
return title;
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index d40c649..69a1a79 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -85,6 +85,7 @@
import javax.naming.ldap.InitialLdapContext;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
+import org.opends.server.util.DynamicConstants;
/**
* This class is in charge of performing the uninstallation of Open DS.
@@ -157,7 +158,8 @@
*/
public Message getFrameTitle() {
Message title = Utils.getCustomizedObject("INFO_FRAME_UNINSTALL_TITLE",
- INFO_FRAME_UNINSTALL_TITLE.get(), Message.class);
+ INFO_FRAME_UNINSTALL_TITLE.get(
+ DynamicConstants.PRODUCT_NAME), Message.class);
return title;
}
diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index 54082b9..c21cc8d 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -198,7 +198,7 @@
SEVERE_ERR_STARTING_SERVER_GENERIC=Could not Start server.
INFO_FINISH_BUTTON_UNINSTALL_LABEL=Uninstall
INFO_FINISH_BUTTON_UNINSTALL_TOOLTIP=Finish Uninstall
-INFO_FRAME_UNINSTALL_TITLE=OpenDS Uninstall
+INFO_FRAME_UNINSTALL_TITLE=%s Uninstall
INFO_INSTALLATION_PATH_LABEL=Installation Path:
INFO_JAVA_VERSION_LABEL=Java Version:
INFO_JMX_PROTOCOL_LABEL=JMX
@@ -965,7 +965,7 @@
MILD_WARN_SECOND_REPLICATION_SERVER_ALREADY_CONFIGURED=The second server \
is already configured with replication port '%d'. The provided replication \
server port '%d' has been ignored.
-INFO_CONTROL_PANEL_TITLE=OpenDS Control Panel
+INFO_CONTROL_PANEL_TITLE=%s Control Panel
INFO_PERSON_ICON_DESCRIPTION=Person object
INFO_ORGANIZATION_ICON_DESCRIPTION=Organization
INFO_ORGANIZATIONAL_UNIT_ICON_DESCRIPTION=Organizational unit
@@ -2403,7 +2403,7 @@
INFO_CTRL_PANEL_OPTIONAL_ATTRIBUTES_LABEL=Optional Attributes:
INFO_CTRL_PANEL_DEFINED_IN_SCHEMA_FILE=Defined in file: %s
-INFO_CTRL_PANEL_GENERIC_TITLE=Control Panel - %s
+INFO_CTRL_PANEL_GENERIC_TITLE=%s Control Panel - %s
INFO_CTRL_PANEL_STATUS_PANEL_TITLE=General Status
MILD_ERR_CTRL_PANEL_ERROR_READING_CONFIGURATION_SUMMARY=Error Reading \
Configuration
diff --git a/opendj-sdk/opends/src/messages/messages/quicksetup.properties b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
index 46d1da2..2baa754 100644
--- a/opendj-sdk/opends/src/messages/messages/quicksetup.properties
+++ b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
@@ -502,8 +502,8 @@
INFO_FINISH_BUTTON_UPGRADE_TOOLTIP=Finish Upgrade
INFO_FINISHED_PANEL_TITLE=Finished
INFO_FINISHED_STEP=Finished
-INFO_FRAME_INSTALL_TITLE=OpenDS QuickSetup
-INFO_FRAME_UPGRADE_TITLE=OpenDS QuickUpgrade
+INFO_FRAME_INSTALL_TITLE=%s QuickSetup
+INFO_FRAME_UPGRADE_TITLE=%s QuickUpgrade
INFO_GENERAL_ACTION_REQUIRED=Action Required
INFO_GENERAL_BUILD_ID=Build ID
INFO_GENERAL_CHECKING_DATA=Checking Data...
@@ -567,16 +567,11 @@
INFO_INSTALL_SERVER_MUST_BE_TEMPORARILY_STARTED=The Server will be \
temporarily started.
INFO_INSTALL_CANCELED=Setup canceled.
-INFO_INSTALLANDUPGRADE_WELCOME_PANEL_INSTRUCTIONS=The OpenDS QuickSetup tool \
+INFO_INSTALLANDUPGRADE_WELCOME_PANEL_INSTRUCTIONS=The %s QuickSetup tool \
can either install and configure a new server instance or upgrade an existing \
- server instance. In either case, QuickSetup will use the latest weekly build, \
- which in this case is: %s (Build ID: %s) <br><br> You can also use QuickSetup \
- to set up a weekly build you have downloaded manually. To run QuickSetup in \
- this case, use the setup command at the top level of the OpenDS \
- directory.<br><br> OpenDS requires a Java SE 5.0 or higher runtime.<br><br> \
+ server instance. <br><br> %s requires a Java SE 5.0 or higher runtime.<br><br> \
Additional information on QuickSetup is available on the <a \
- href="https://www.opends.org/wiki/page/OverviewOfTheQuickSetupTool"> OpenDS \
- documentation wiki</a>.
+ href="%s"> %s documentation site</a>.
INFO_INSTALLANDUPGRADE_WELCOME_PANEL_TITLE=Welcome
INFO_INSTALLANDUPGRADER_RBINSTALL_LABEL=Install New Server Instance
INFO_INSTALLANDUPGRADER_RBINSTALL_TOOLTIP=Select to install a new server \
@@ -1008,11 +1003,10 @@
INFO_SUMMARY_INSTALL_FINISHED_CANCELED=<b>QuickSetup Canceled.</b> \
<br>The setup was canceled and any files installed to your system \
during this operation have been removed.
-INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY=<b>OpenDS QuickSetup Completed \
- Successfully.</b><br>OpenDS is now installed in %s.<br>The server is \
+INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY=<b>%s QuickSetup Completed \
+ Successfully.</b><br>%s is now installed in %s.<br>The server is \
%s.<br><br>Visit the <a \
- href="https://www.opends.org/wiki/page/QuickReferenceGuide"> OpenDS Quick \
- Reference</a> page for an overview of server management and \
+ href="%s"> %s Administration Guide</a> for an overview of server management and \
configuration.<br>To see server configuration status and to perform \
some basic administration tasks on the server, click Launch Control Panel. \
Note that you can launch this tool later using %s.<br><INPUT type="submit" \
@@ -1086,7 +1080,7 @@
Successfully.</b><br>The server installation at %s has now been upgraded to \
version %s.<br><br><INPUT type="submit" value="Launch Control Panel"></INPUT>
INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY_CLI=QuickUpgrade Completed \
- Successfully. The OpenDS installation at %s has now been upgraded to version \
+ Successfully. The %s installation at %s has now been upgraded to version \
%s.
INFO_SUMMARY_UPGRADE_FINISHED_WITH_ERRORS=<b>QuickUpgrade \
Failed</b><br>The upgrade operation could not complete successfully due to \
@@ -1311,16 +1305,11 @@
INFO_WEB_PROXY_DLG_PORT_LABEL=Port:
INFO_WEB_PROXY_DLG_TITLE=Web Proxy Configuration
INFO_WEB_PROXY_DLG_USER_LABEL=User:
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=The OpenDS QuickSetup tool will ask \
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=The %s QuickSetup tool will ask \
you for some basic server and data configuration settings and will get your \
- server up and running quickly.<br><br>Note that you can also install the \
- latest weekly build launching the setup via Java Web Start from the <a \
- href="https://opends.dev.java.net/public/downloads_index.html">OpenDS \
- Downloads Page</a>. This instance of QuickSetup will use the following \
- OpenDS build: %s (Build ID: %s) <br><br> OpenDS requires a Java SE 5.0 or \
+ server up and running quickly.<br><br> %s requires a Java SE 5.0 or \
higher runtime.<br><br> Additional information on QuickSetup is available on \
- the <a href="https://www.opends.org/wiki/page/OverviewOfTheQuickSetupTool"> \
- OpenDS documentation wiki</a>.
+ the <a href="%s"> %s documentation site</a>.
INFO_WELCOME_PANEL_TITLE=Welcome
INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS=The OpenDS QuickSetup tool will ask \
you for some basic server and data configuration settings and will get your \
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
index 77735b4..51d1b6c 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
@@ -61,6 +61,7 @@
import org.opends.quicksetup.upgrader.Upgrader;
import org.opends.quicksetup.util.ProgressMessageFormatter;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.util.DynamicConstants;
/**
* Application that allows to upgrade or install OpenDS.
@@ -133,7 +134,8 @@
*/
public Message getFrameTitle() {
return Utils.getCustomizedObject("INFO_FRAME_INSTALL_TITLE",
- INFO_FRAME_INSTALL_TITLE.get(), Message.class);
+ INFO_FRAME_INSTALL_TITLE.get(DynamicConstants.PRODUCT_NAME),
+ Message.class);
}
/**
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java
index 8b47847..9722e96 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/ui/WelcomePanel.java
@@ -148,8 +148,10 @@
return Utils.getCustomizedObject(
"INFO_INSTALLANDUPGRADE_WELCOME_PANEL_INSTRUCTIONS",
INFO_INSTALLANDUPGRADE_WELCOME_PANEL_INSTRUCTIONS.get(
- DynamicConstants.COMPACT_VERSION_STRING,
- DynamicConstants.BUILD_ID),
+ DynamicConstants.SHORT_NAME,
+ DynamicConstants.SHORT_NAME,
+ DynamicConstants.DOC_REFERENCE_WIKI,
+ DynamicConstants.SHORT_NAME),
Message.class);
}
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index b10f049..6d5af6f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -98,6 +98,7 @@
import javax.naming.ldap.Rdn;
import javax.swing.*;
+import org.opends.server.util.DynamicConstants;
/**
@@ -607,7 +608,8 @@
*/
public Message getFrameTitle() {
return Utils.getCustomizedObject("INFO_FRAME_INSTALL_TITLE",
- INFO_FRAME_INSTALL_TITLE.get(), Message.class);
+ INFO_FRAME_INSTALL_TITLE.get(DynamicConstants.PRODUCT_NAME),
+ Message.class);
}
/** Indicates the current progress step. */
@@ -2053,7 +2055,12 @@
Message successMessage = Utils.getCustomizedObject(
"INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY",
INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(
- formattedPath, INFO_GENERAL_SERVER_STOPPED.get(),
+ DynamicConstants.PRODUCT_NAME,
+ DynamicConstants.PRODUCT_NAME,
+ formattedPath,
+ INFO_GENERAL_SERVER_STOPPED.get(),
+ DynamicConstants.DOC_QUICK_REFERENCE_GUIDE,
+ DynamicConstants.PRODUCT_NAME,
cmd), Message.class);
hmSummary.put(InstallProgressStep.FINISHED_SUCCESSFULLY,
getFormattedSuccess(successMessage));
@@ -2092,9 +2099,14 @@
60, 5);
Message successMessage = Utils.getCustomizedObject(
"INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY",
- INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(formattedPath,
- status,
- cmd), Message.class);
+ INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(
+ DynamicConstants.PRODUCT_NAME,
+ DynamicConstants.PRODUCT_NAME,
+ formattedPath,
+ status,
+ DynamicConstants.DOC_QUICK_REFERENCE_GUIDE,
+ DynamicConstants.PRODUCT_NAME,
+ cmd), Message.class);
hmSummary.put(InstallProgressStep.FINISHED_SUCCESSFULLY,
getFormattedSuccess(successMessage));
hmSummary.put(InstallProgressStep.FINISHED_WITH_ERROR,
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
index 780fe04..bce0345 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
@@ -45,6 +45,7 @@
import org.opends.messages.Message;
import org.opends.server.tools.InstallDS;
import org.opends.server.tools.InstallDSArgumentParser;
+import org.opends.server.util.DynamicConstants;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
@@ -218,7 +219,8 @@
*/
protected Message getFrameTitle() {
return Utils.getCustomizedObject("INFO_FRAME_INSTALL_TITLE",
- INFO_FRAME_INSTALL_TITLE.get(), Message.class);
+ INFO_FRAME_INSTALL_TITLE.get(DynamicConstants.PRODUCT_NAME),
+ Message.class);
}
/**
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
index 552a7f6..2699ad1 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
@@ -93,8 +93,10 @@
message = Utils.getCustomizedObject(
"INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS",
INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS.get(
- DynamicConstants.COMPACT_VERSION_STRING,
- DynamicConstants.BUILD_ID),
+ DynamicConstants.SHORT_NAME,
+ DynamicConstants.SHORT_NAME,
+ DynamicConstants.DOC_REFERENCE_WIKI,
+ DynamicConstants.SHORT_NAME),
Message.class);
}
return message;
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index bbd52c2..7c40fda 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -48,6 +48,7 @@
import java.util.logging.Logger;
import java.io.File;
+import org.opends.server.util.DynamicConstants;
/**
* This class is called by the upgrade and upgrade.bat
@@ -118,7 +119,8 @@
*/
protected Message getFrameTitle() {
return Utils.getCustomizedObject("INFO_FRAME_UPGRADE_TITLE",
- INFO_FRAME_UPGRADE_TITLE.get(), Message.class);
+ INFO_FRAME_UPGRADE_TITLE.get(DynamicConstants.PRODUCT_NAME),
+ Message.class);
}
/**
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index 22dfe21..4523404 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -94,6 +94,7 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.opends.server.util.DynamicConstants;
/**
* QuickSetup application of upgrading the bits of an installation of
@@ -283,7 +284,8 @@
*/
public Message getFrameTitle() {
return Utils.getCustomizedObject("INFO_FRAME_UPGRADE_TITLE",
- INFO_FRAME_UPGRADE_TITLE.get(), Message.class);
+ INFO_FRAME_UPGRADE_TITLE.get(DynamicConstants.PRODUCT_NAME),
+ Message.class);
}
/**
@@ -2021,6 +2023,7 @@
}
if (Utils.isCli()) {
txt = INFO_SUMMARY_UPGRADE_FINISHED_SUCCESSFULLY_CLI.get(
+ DynamicConstants.PRODUCT_NAME,
formatter.getFormattedText(Message.raw(installPath)),
newVersion);
} else {
--
Gitblit v1.10.0