modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java | 12 +++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
New commits: commit 3fb598f39950b89d1ac4d3c1aa5a9304248c73fe Author: Jay Shaughnessy jshaughn@jshaughn.csb Date: Fri Sep 21 17:31:53 2012 -0400
Tweak custom login module deploy utility to only create the security-domain if it does not already exist.
diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java index 38dabe3..a0a4280 100644 --- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java +++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java @@ -161,8 +161,13 @@ public class SecurityDomainJBossASClient extends JBossASClient { Map<String, String> moduleOptionProperties) throws Exception {
Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_SECURITY, SECURITY_DOMAIN, securityDomainName); - ModelNode addTopNode = createRequest(ADD, addr); - addTopNode.get(CACHE_TYPE).set("default"); + ModelNode addTopNode = null; + + // If necessary create the security domain, otherwise just add the loginModule + if (!isSecurityDomain(securityDomainName)) { + addTopNode = createRequest(ADD, addr); + addTopNode.get(CACHE_TYPE).set("default"); + }
ModelNode addAuthNode = createRequest(ADD, addr.clone().add(AUTHENTICATION, CLASSIC)); ModelNode loginModulesNode = addAuthNode.get(LOGIN_MODULES); @@ -180,7 +185,8 @@ public class SecurityDomainJBossASClient extends JBossASClient {
loginModulesNode.add(loginModule);
- ModelNode batch = createBatchRequest(addTopNode, addAuthNode); + ModelNode batch = (null != addTopNode) ? createBatchRequest(addTopNode, addAuthNode) + : createBatchRequest(addAuthNode); ModelNode results = execute(batch); if (!isSuccess(results)) { throw new FailureException(results, "Failed to create security domain [" + securityDomainName + "]");
rhq-commits@lists.fedorahosted.org