[rhq] Branch 'rhq-on-as7' - 2 commits - etc/eclipse-tools modules/enterprise

mazz mazz at fedoraproject.org
Mon Aug 6 16:01:32 UTC 2012


 etc/eclipse-tools/maven/RHQ                                                                                     |   22 +++++-----
 modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java           |   18 +++++++-
 modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties |   12 +++++
 3 files changed, 40 insertions(+), 12 deletions(-)

New commits:
commit 9af52e47918ba956e2fce1ac85de0a01a6bbb0c7
Author: John Mazzitelli <mazz at redhat.com>
Date:   Mon Aug 6 12:01:26 2012 -0400

    add contextual help

diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java
index ca68076..f0921ba 100644
--- a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java
+++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java
@@ -477,6 +477,14 @@ public class Installer implements EntryPoint {
         buttonSpacer.setEndRow(false);
         testConnectionButton.setStartRow(false);
 
+        // add contextual help for users
+        addContextualHelp(dbType, MSG.help_dbType());
+        addContextualHelp(dbConnectionUrl, MSG.help_dbConnectionUrl());
+        addContextualHelp(dbUsername, MSG.help_dbUsername());
+        addContextualHelp(dbPassword, MSG.help_dbPassword());
+        addContextualHelp(testConnectionButton, MSG.help_testConnectionButton());
+        addContextualHelp(dbExistingSchemaOption, MSG.help_dbExistingSchemaOption());
+
         databaseForm.setFields(dbType, dbConnectionUrl, dbUsername, dbPassword, buttonSpacer, testConnectionButton,
             dbExistingSchemaOption);
 
@@ -549,7 +557,6 @@ public class Installer implements EntryPoint {
         registeredServersSelection = new SelectItem("registeredServersSelectItem",
             MSG.tab_simpleView_serverSettings_registeredServers());
         registeredServersSelection.setWidth(fieldWidth);
-        addContextualHelp(registeredServersSelection, MSG.help_registeredServers());
         registeredServerNames.put(NEW_SERVER_TO_REGISTER,
             MSG.tab_simpleView_serverSettings_registeredServers_newServer());
         registeredServersSelection.setValueMap(registeredServerNames);
@@ -606,6 +613,15 @@ public class Installer implements EntryPoint {
             }
         });
 
+        // add contextual help for users
+        addContextualHelp(registeredServersSelection, MSG.help_registeredServers());
+        addContextualHelp(serverSettingServerName, MSG.help_ssServerName());
+        addContextualHelp(serverSettingPublicAddress, MSG.help_ssPublicAddress());
+        addContextualHelp(serverSettingWebHttpPort, MSG.help_ssHttpPort());
+        addContextualHelp(serverSettingWebSecureHttpPort, MSG.help_ssHttpsPort());
+        addContextualHelp(serverSettingEmailSMTPHostname, MSG.help_ssEmailHostname());
+        addContextualHelp(serverSettingEmailFromAddress, MSG.help_ssEmailFromAddress());
+
         serverSettingsForm.setItems(registeredServersSelection, serverSettingServerName, serverSettingPublicAddress,
             serverSettingWebHttpPort, serverSettingWebSecureHttpPort, serverSettingEmailSMTPHostname,
             serverSettingEmailFromAddress);
diff --git a/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties
index 9708d56..19d5d2d 100644
--- a/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties
+++ b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties
@@ -2,7 +2,19 @@ button_reset = Reset
 button_save = Save
 button_startInstallation = Press To Start The Installation Now
 button_testConnection = Test Connection
+help_dbConnectionUrl = This is the JDBC connection URL that will be used to determine where your database server is and how to connect to it.
+help_dbExistingSchemaOption = Your database already has a schema installed. This option tells the installer what you want to do with this existing schema. You can either:<br/>\n<ul>\n<li>Keep the existing schema. This will upgrade the schema to support the new server being installed but all of your resource inventory and related data will be saved.</li>\n<li>Overwrite the existing schema. This will delete all of your previous data and create a new, empty set of tables. When you do this, you will lose all of your resource inventory and related data.</li>\n<li>Skip the database schema setup. If, for some reason, you do not want the installer to do anything to your database (even to check to see if it needs to be updated), select this option. You rarely will want to use this option unless you know your database schema is completely up to date and can support the new server you are installing.</li>\n</ul>
+help_dbPassword = This is the credentials that will be used to connect to the database. This is the actual password for your user, not the encrypted password. The installer will encrypt this password for you before storing it in the properties file.
+help_dbType = Select the type of database that is to be used by the server. The server only supports these types of databases.
+help_dbUsername = The server will connect to the database as this user.
 help_registeredServers = If you are performing an upgrade or a re-installation then you should select a server from this list of registered servers. If you want to install a new server into the system, select the *New Server* option. (Note that if you are going to overwrite your existing schema, you cannot select an existing registered server since they will be deleted when the overwrite is performed.)
+help_ssEmailFromAddress = When the server sends emails (e.g. via alert email notifications), this will be the address that will be in the email From: line.
+help_ssEmailHostname = This is the SMTP server hostname that will be used to send emails by this server.
+help_ssHttpPort = This is the HTTP port that users can use to access the web GUI for this server. This is also the same port that agents will use to talk to this server if the agents send messages over the servlet protocol (which is the default protocol).
+help_ssHttpsPort = This is the secure HTTPS port that users can use to access the web GUI for this server. This is also the same port that agents will use to talk to this server if the agents send messages over the sslservlet protocol.
+help_ssPublicAddress = This is the IP address or hostname that agents will use to connect to this server. This value is not stored in server properties file; rather, it is stored in the database. You can later modify this value in the Administration (Topology) > Servers section of the GUI.
+help_ssServerName = This is a unique name to be assigned to this server. All servers must be assigned unique server names, however, they do not have to match the IP address or hostname of the server.
+help_testConnectionButton = You must confirm that your database settings are correct by pushing this button which tests the connection settings.
 message_formDidNotValidate = Please fix the errors before continuing.
 message_install_done = The installation has completed.
 message_install_failed = The installation failed.


commit b098bbbae7fc92b68801e5de60deea56e9153b7d
Author: John Mazzitelli <mazz at redhat.com>
Date:   Mon Aug 6 11:48:21 2012 -0400

    change the eclipse tool to build the new installer, not the old

diff --git a/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Installer Only.launch b/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Installer Only.launch
index 57dea2c..1ee69a2 100644
--- a/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Installer Only.launch	
+++ b/etc/eclipse-tools/maven/RHQ Maven Build - Dev Profile Installer Only.launch	
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="bad_container_name" value="\rhq\etc\eclipse-tools\maven"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:M2_HOME}/bin/${MAVEN_EXE}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-o -Dmaven.test.skip=true -Pdev install"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/rhq/modules/enterprise/gui/installer-war}"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+<stringAttribute key="bad_container_name" value="\rhq\etc\eclipse-tools\maven"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:M2_HOME}/bin/${MAVEN_EXE}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-o -Dmaven.test.skip=true -Pdev install"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/rhq/modules/enterprise/gui/installer}"/>
+</launchConfiguration>




More information about the rhq-commits mailing list