[rhq] Branch 'rhq-on-as7' - modules/enterprise

mazz mazz at fedoraproject.org
Tue Aug 7 07:15:33 UTC 2012


 modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java         |    9 --------
 modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java |   11 ----------
 modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java       |    4 +--
 3 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit 2ddb051f436cdfcc01588a2b25e80142ae55958b
Author: John Mazzitelli <mazz at redhat.com>
Date:   Tue Aug 7 03:15:29 2012 -0400

    fix datasource

diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java
index b640b61..97e776e 100644
--- a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java
+++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java
@@ -102,15 +102,6 @@ public interface InstallerGWTService extends RemoteService {
     HashMap<String, String> getServerProperties() throws Exception;
 
     /**
-     * Allows the installer to set runtime system properties in the JBossAS app server container.
-     *
-     * @param name the name of the sysprop to set
-     * @param value the value of the sysprop to set
-     * @throws Exception
-     */
-    void setSystemProperty(String name, String value) throws Exception;
-
-    /**
      * Returns the version string for the app server itself (e.g. "7.1.2.Final").
      * @return version string of app server
      * @throws Exception
diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java
index afd5a3f..5396a76 100644
--- a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java
+++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java
@@ -316,15 +316,6 @@ public class InstallerGWTServiceImpl extends RemoteServiceServlet implements Ins
         return map;
     }
 
-    @Override
-    public void setSystemProperty(String name, String value) throws Exception {
-        try {
-            new JBossASClient(getClient()).setSystemProperty(name, value);
-        } catch (Exception e) {
-            throw new Exception(ThrowableUtil.getAllMessages(e));
-        }
-    }
-
     /**
      * Save the given properties to the server's .properties file.
      *
@@ -350,7 +341,7 @@ public class InstallerGWTServiceImpl extends RemoteServiceServlet implements Ins
         // we need to put them as system properties now so when we hot deploy,
         // the replacement variables in the config files pick up the new values
         for (Map.Entry<String, String> entry : serverProperties.entrySet()) {
-            setSystemProperty(entry.getKey(), entry.getValue());
+            System.setProperty(entry.getKey(), entry.getValue());
         }
 
         return;
diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java
index b4c8bef..6fb60bb 100644
--- a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java
+++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java
@@ -253,7 +253,7 @@ public class ServerInstallUtil {
             "org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter", 15, false, 2, 5, 75,
             RHQ_SECURITY_DOMAIN, "-unused-stale-conn-checker-", "TRANSACTION_READ_COMMITTED",
             "org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker", props);
-        noTxDsRequest.remove("stale-connection-checker-class-name"); // we don't have one of these for postgres
+        noTxDsRequest.get("steps").get(0).remove("stale-connection-checker-class-name"); // we don't have one of these for postgres
 
         props.clear();
         props.put("ServerName", "${rhq.server.database.server-name:127.0.0.1}");
@@ -264,7 +264,7 @@ public class ServerInstallUtil {
             JDBC_DRIVER_POSTGRES, "org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter", 15, 5,
             50, 75, RHQ_SECURITY_DOMAIN, "-unused-stale-conn-checker-", "TRANSACTION_READ_COMMITTED",
             "org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker", props);
-        xaDsRequest.remove("stale-connection-checker-class-name"); // we don't have one of these for postgres
+        xaDsRequest.get("steps").get(0).remove("stale-connection-checker-class-name"); // we don't have one of these for postgres
 
         ModelNode batch = DatasourceJBossASClient.createBatchRequest(noTxDsRequest, xaDsRequest);
         ModelNode results = client.execute(batch);




More information about the rhq-commits mailing list