[rhq] Branch 'rhq-on-as7' - 2 commits - modules/enterprise
mazz
mazz at fedoraproject.org
Fri Aug 24 17:12:25 UTC 2012
modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java | 45 ++++++++++
modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java | 1
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java | 6 +
modules/enterprise/server/ear/pom.xml | 3
modules/enterprise/server/jar/pom.xml | 1
5 files changed, 55 insertions(+), 1 deletion(-)
New commits:
commit 0b88540b9f005ed74a232f309399e3264141a704
Author: John Mazzitelli <mazz at redhat.com>
Date: Fri Aug 24 13:12:19 2012 -0400
enable the datasource
diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
index 142661a..aea69ea 100644
--- a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
+++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
@@ -36,11 +36,56 @@ public class DatasourceJBossASClient extends JBossASClient {
public static final String JDBC_DRIVER = "jdbc-driver";
public static final String CONNECTION_PROPERTIES = "connection-properties";
public static final String XA_DATASOURCE_PROPERTIES = "xa-datasource-properties";
+ public static final String OP_ENABLE = "enable";
public DatasourceJBossASClient(ModelControllerClient client) {
super(client);
}
+ public boolean isDatasourceEnabled(String name) throws Exception {
+ return isDatasourceEnabled(false, name);
+ }
+
+ public boolean isXADatasourceEnabled(String name) throws Exception {
+ return isDatasourceEnabled(true, name);
+ }
+
+ private boolean isDatasourceEnabled(boolean isXA, String name) throws Exception {
+ Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_DATASOURCES);
+ addr.add((isXA) ? XA_DATA_SOURCE : DATA_SOURCE, name);
+ ModelNode results = readResource(addr);
+ boolean enabledFlag = false;
+ if (results.hasDefined("enabled")) {
+ ModelNode enabled = results.get("enabled");
+ enabledFlag = enabled.asBoolean(false);
+ }
+ return enabledFlag;
+ }
+
+ public void enableDatasource(String name) throws Exception {
+ enableDatasource(false, name);
+ }
+
+ public void enableXADatasource(String name) throws Exception {
+ enableDatasource(true, name);
+ }
+
+ private void enableDatasource(boolean isXA, String name) throws Exception {
+ if (isDatasourceEnabled(isXA, name)) {
+ return; // nothing to do - its already enabled
+ }
+
+ Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_DATASOURCES);
+ addr.add((isXA) ? XA_DATA_SOURCE : DATA_SOURCE, name);
+ ModelNode request = createRequest(OP_ENABLE, addr);
+ request.get(PERSISTENT).set(true);
+ ModelNode results = execute(request);
+ if (!isSuccess(results)) {
+ throw new FailureException(results);
+ }
+ return; // everything is OK
+ }
+
/**
* Checks to see if there is already a JDBC driver with the given name.
*
diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java
index ccbcc1d..93234a8 100644
--- a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java
+++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java
@@ -56,6 +56,7 @@ public class JBossASClient {
public static final String WRITE_ATTRIBUTE = "write-attribute";
public static final String ADD = "add";
public static final String SYSTEM_PROPERTY = "system-property";
+ public static final String PERSISTENT = "persistent"; // used by some operations to persist their effects
private ModelControllerClient client;
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 32af0f4..14046ae 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
@@ -302,6 +302,12 @@ public class ServerInstallUtil {
}
LOG.info("Created datasources");
+
+ final DatasourceJBossASClient client = new DatasourceJBossASClient(mcc);
+ client.enableDatasource(RHQ_DATASOURCE_NAME_NOTX);
+ client.enableXADatasource(RHQ_DATASOURCE_NAME_XA);
+ LOG.info("Enabled datasources");
+
}
private static void createNewDatasources_Postgres(ModelControllerClient mcc) throws Exception {
commit 2641fe163b78421d7d8b10d1bf1364a65c84d48c
Author: John Mazzitelli <mazz at redhat.com>
Date: Fri Aug 24 13:03:54 2012 -0400
set ejb version to 3.0 in the maven plugin config
add apache commons loggnig dep so follow AS7 documentation
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index d3d88ac..900df43 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -228,7 +228,8 @@
<manifestEntries>
<!-- org.jboss.common-core - needed to fix https://issues.jboss.org/browse/AS7-5336 -->
<!-- org.jboss.jta - needed for Arjuna CheckedAction related classes and our custom tx interceptor -->
- <Dependencies>org.jboss.common-core export,org.jboss.jts</Dependencies>
+ <!-- org.apache.commons.logging - needed as per https://docs.jboss.org/author/display/AS71/How+do+I+migrate+my+application+from+AS5+or+AS6+to+AS7 -->
+ <Dependencies>org.jboss.common-core export,org.jboss.jts,org.apache.commons.logging</Dependencies>
</manifestEntries>
</archive>
<modules>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 0feaf33..2c9d023 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -594,6 +594,7 @@
<artifactId>maven-ejb-plugin</artifactId>
<version>2.3</version>
<configuration>
+ <ejbVersion>3.0</ejbVersion>
<generateClient>true</generateClient>
</configuration>
</plugin>
More information about the rhq-commits
mailing list