modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java | 26 ++++++---- 1 file changed, 18 insertions(+), 8 deletions(-)
New commits: commit b423892e0a62f0945f2d2d82a3b1f0e9d41c45a0 Author: John Mazzitelli mazz@redhat.com Date: Wed Oct 24 11:13:21 2012 -0400
support adding a JDBC driver that does not support XA
diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java index b1f7a98..ab44796 100644 --- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java +++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java @@ -132,18 +132,28 @@ public class DatasourceJBossASClient extends JBossASClient { * @param name the name of the JDBC driver (this is not the name of the JDBC jar or the module name, it is * just a convienence name of the JDBC driver configuration). * @param moduleName the name of the JBossAS module where the JDBC driver is installed - * @param driverXaClassName the JDBC driver's XA datasource classname + * @param driverXaClassName the JDBC driver's XA datasource classname (null if XA is not supported) * * @return the request to create the JDBC driver configuration. */ public ModelNode createNewJdbcDriverRequest(String name, String moduleName, String driverXaClassName) { - String dmrTemplate = "" // - + "{" // - + ""driver-module-name" => "%s" " // - + ", "driver-xa-datasource-class-name" => "%s" " // - + "}"; - - String dmr = String.format(dmrTemplate, moduleName, driverXaClassName); + String dmrTemplate; + String dmr; + + if (driverXaClassName != null) { + dmrTemplate = "" // + + "{" // + + ""driver-module-name" => "%s" " // + + ", "driver-xa-datasource-class-name" => "%s" " // + + "}"; + dmr = String.format(dmrTemplate, moduleName, driverXaClassName); + } else { + dmrTemplate = "" // + + "{" // + + ""driver-module-name" => "%s" " // + + "}"; + dmr = String.format(dmrTemplate, moduleName); + }
Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_DATASOURCES, JDBC_DRIVER, name); final ModelNode request = ModelNode.fromString(dmr);
rhq-commits@lists.fedorahosted.org