JBossWS SVN: r16125 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 13:09:15 -0400 (Fri, 06 Apr 2012)
New Revision: 16125
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16108-16110,16122-16123 via svnmerge
.......
r16108 | alessio.soldano(a)jboss.com | 2012-04-06 12:41:22 +0200 (Fri, 06 Apr 2012) | 2 lines
[JBWS-3482] Use different context-root for endpoints that can be deployed concurrently
.......
r16109 | alessio.soldano(a)jboss.com | 2012-04-06 12:47:07 +0200 (Fri, 06 Apr 2012) | 2 lines
[JBWS-3482] Adding jbossws-cxf-server dependency into jbossws-cxf-resources module to make sure they're built in the proper order when using maven parallel execution
.......
r16110 | alessio.soldano(a)jboss.com | 2012-04-06 12:47:53 +0200 (Fri, 06 Apr 2012) | 2 lines
[JBWS-3482] Move to JUnit 4.10
.......
r16122 | alessio.soldano(a)jboss.com | 2012-04-06 18:31:19 +0200 (Fri, 06 Apr 2012) | 2 lines
[JBWS-3483] Moving to ASIL 4.1.0-SNAPSHOT + updating testsuite profiles
.......
r16123 | alessio.soldano(a)jboss.com | 2012-04-06 18:36:56 +0200 (Fri, 06 Apr 2012) | 2 lines
[JBWS-3482] Moving JBWS2150 test to forked test group as it can affect other tests running at the same time
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
12 years, 1 month
JBossWS SVN: r16124 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 12:52:05 -0400 (Fri, 06 Apr 2012)
New Revision: 16124
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3483] Updating testsuite profile
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-04-06 16:36:56 UTC (rev 16123)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-04-06 16:52:05 UTC (rev 16124)
@@ -288,9 +288,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss.version}</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss711</artifactId>
+ <classifier>tests-integration</classifier>
<exclusions>
<exclusion>
<groupId>org.jboss.as</groupId>
12 years, 1 month
JBossWS SVN: r16123 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 12:36:56 -0400 (Fri, 06 Apr 2012)
New Revision: 16123
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3482] Moving JBWS2150 test to forked test group as it can affect other tests running at the same time
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-04-06 16:31:19 UTC (rev 16122)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-04-06 16:36:56 UTC (rev 16123)
@@ -365,6 +365,7 @@
<includes>
<include>**/smoke/tools/**/*TestForked.java</include>
<include>**/smoke/tools/**/*TestCaseForked.java</include>
+ <include>**/jbws2150/**/*TestCaseForked.java</include>
</includes>
<systemProperties>
<property>
12 years, 1 month
JBossWS SVN: r16122 - in stack/cxf/trunk: modules/dist and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 12:31:19 -0400 (Fri, 06 Apr 2012)
New Revision: 16122
Modified:
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3483] Moving to ASIL 4.1.0-SNAPSHOT + updating testsuite profiles
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2012-04-06 16:21:50 UTC (rev 16121)
+++ stack/cxf/trunk/modules/dist/pom.xml 2012-04-06 16:31:19 UTC (rev 16122)
@@ -157,6 +157,18 @@
<groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -164,12 +176,40 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss710</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss711</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--junit-->
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-04-06 16:21:50 UTC (rev 16121)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-04-06 16:31:19 UTC (rev 16122)
@@ -584,9 +584,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss.version}</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss702</artifactId>
+ <classifier>tests-integration</classifier>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -767,9 +767,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss.version}</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss710</artifactId>
+ <classifier>tests-integration</classifier>
<exclusions>
<exclusion>
<groupId>org.jboss.as</groupId>
@@ -994,9 +994,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss.version}</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss711</artifactId>
+ <classifier>tests-integration</classifier>
<exclusions>
<exclusion>
<groupId>org.jboss.as</groupId>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-04-06 16:21:50 UTC (rev 16121)
+++ stack/cxf/trunk/pom.xml 2012-04-06 16:31:19 UTC (rev 16122)
@@ -64,9 +64,8 @@
<jbossws.common.version>2.0.2.GA</jbossws.common.version> <!-- TODO [JBWS-3473] move back to 2.1.0-SNAPSHOT -->
<jbossws.common.tools.version>1.1.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
- <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
- <jbossws.jboss710.version>4.0.2.GA</jbossws.jboss710.version>
+ <jbossws.jboss702.version>4.1.0-SNAPSHOT</jbossws.jboss702.version>
+ <jbossws.jboss710.version>4.1.0-SNAPSHOT</jbossws.jboss710.version>
<jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version>
<jboss702.version>7.0.2.Final</jboss702.version>
<jboss710.version>7.1.0.Final</jboss710.version>
12 years, 1 month
JBossWS SVN: r16121 - container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 12:21:50 -0400 (Fri, 06 Apr 2012)
New Revision: 16121
Modified:
container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
Log:
[JBWS-3482] Changes for supporting concurrent deployments
Modified: container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
===================================================================
--- container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 16:15:09 UTC (rev 16120)
+++ container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 16:21:50 UTC (rev 16121)
@@ -96,6 +96,8 @@
private final CallbackHandler callbackHandler = getCallbackHandler();
private final ServerDeploymentManager deploymentManager;
private final ModelControllerClient modelControllerClient;
+ private final Map<String, Integer> securityDomainUsers = new HashMap<String, Integer>(1);
+ private final Map<String, Integer> archiveCounters = new HashMap<String, Integer>();
public RemoteDeployer() throws IOException {
final String host = System.getProperty(JBWS_DEPLOYER_HOST);
@@ -112,25 +114,48 @@
@Override
public void deploy(final URL archiveURL) throws Exception {
- final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan().add(archiveURL).andDeploy();
- final DeploymentPlan plan = builder.build();
- final DeploymentAction deployAction = builder.getLastAction();
- final String uniqueId = deployAction.getDeploymentUnitUniqueName();
- executeDeploymentPlan(plan, deployAction);
- url2Id.put(archiveURL, uniqueId);
+ synchronized (archiveCounters) {
+ String k = archiveURL.toString();
+ if (archiveCounters.containsKey(k)) {
+ int count = archiveCounters.get(k);
+ archiveCounters.put(k, (count + 1));
+ return;
+ } else {
+ archiveCounters.put(k, 1);
+ }
+
+ final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan().add(archiveURL).andDeploy();
+ final DeploymentPlan plan = builder.build();
+ final DeploymentAction deployAction = builder.getLastAction();
+ final String uniqueId = deployAction.getDeploymentUnitUniqueName();
+ executeDeploymentPlan(plan, deployAction);
+ url2Id.put(archiveURL, uniqueId);
+ }
}
+ @Override
public void undeploy(final URL archiveURL) throws Exception {
- final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan();
- final String uniqueName = url2Id.get(archiveURL);
- if (uniqueName != null) {
- final DeploymentPlan plan = builder.undeploy(uniqueName).remove(uniqueName).build();
- final DeploymentAction deployAction = builder.getLastAction();
- try {
- executeDeploymentPlan(plan, deployAction);
- } finally {
- url2Id.remove(archiveURL);
+ synchronized (archiveCounters) {
+ String k = archiveURL.toString();
+ int count = archiveCounters.get(k);
+ if (count > 1) {
+ archiveCounters.put(k, (count - 1));
+ return;
+ } else {
+ archiveCounters.remove(k);
}
+
+ final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan();
+ final String uniqueName = url2Id.get(archiveURL);
+ if (uniqueName != null) {
+ final DeploymentPlan plan = builder.undeploy(uniqueName).remove(uniqueName).build();
+ final DeploymentAction deployAction = builder.getLastAction();
+ try {
+ executeDeploymentPlan(plan, deployAction);
+ } finally {
+ url2Id.remove(archiveURL);
+ }
+ }
}
}
@@ -162,45 +187,66 @@
return response.get(RESULT).asString();
}
+ @Override
public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception {
- final List<ModelNode> updates = new ArrayList<ModelNode>();
-
- ModelNode op = new ModelNode();
- op.get(OP).set(ADD);
- op.get(OP_ADDR).add(SUBSYSTEM, "security");
- op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- updates.add(op);
-
- op = new ModelNode();
- op.get(OP).set(ADD);
- op.get(OP_ADDR).add(SUBSYSTEM, "security");
- op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- op.get(OP_ADDR).add(AUTHENTICATION, CLASSIC);
-
- final ModelNode loginModule = op.get(LOGIN_MODULES).add();
- loginModule.get(CODE).set("UsersRoles");
- loginModule.get(FLAG).set(REQUIRED);
- op.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
- updates.add(op);
-
- final ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
- if (authenticationOptions != null) {
- for (final String k : authenticationOptions.keySet()) {
- moduleOptions.add(k, authenticationOptions.get(k));
+ synchronized (securityDomainUsers) {
+ if (securityDomainUsers.containsKey(name)) {
+ int count = securityDomainUsers.get(name);
+ securityDomainUsers.put(name, (count + 1));
+ return;
+ } else {
+ securityDomainUsers.put(name, 1);
}
+
+ final List<ModelNode> updates = new ArrayList<ModelNode>();
+
+ ModelNode op = new ModelNode();
+ op.get(OP).set(ADD);
+ op.get(OP_ADDR).add(SUBSYSTEM, "security");
+ op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
+ updates.add(op);
+
+ op = new ModelNode();
+ op.get(OP).set(ADD);
+ op.get(OP_ADDR).add(SUBSYSTEM, "security");
+ op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
+ op.get(OP_ADDR).add(AUTHENTICATION, CLASSIC);
+
+ final ModelNode loginModule = op.get(LOGIN_MODULES).add();
+ loginModule.get(CODE).set("UsersRoles");
+ loginModule.get(FLAG).set(REQUIRED);
+ op.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
+ updates.add(op);
+
+ final ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
+ if (authenticationOptions != null) {
+ for (final String k : authenticationOptions.keySet()) {
+ moduleOptions.add(k, authenticationOptions.get(k));
+ }
+ }
+
+ applyUpdates(updates, getModelControllerClient());
}
-
- applyUpdates(updates, getModelControllerClient());
}
public void removeSecurityDomain(String name) throws Exception {
- final ModelNode op = new ModelNode();
- op.get(OP).set(REMOVE);
- op.get(OP_ADDR).add(SUBSYSTEM, "security");
- op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- op.get(OPERATION_HEADERS, ROLLBACK_ON_RUNTIME_FAILURE).set(false);
-
- applyUpdate(op, getModelControllerClient());
+ synchronized (securityDomainUsers) {
+ int count = securityDomainUsers.get(name);
+ if (count > 1) {
+ securityDomainUsers.put(name, (count - 1));
+ return;
+ } else {
+ securityDomainUsers.remove(name);
+ }
+
+ final ModelNode op = new ModelNode();
+ op.get(OP).set(REMOVE);
+ op.get(OP_ADDR).add(SUBSYSTEM, "security");
+ op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
+ op.get(OPERATION_HEADERS, ROLLBACK_ON_RUNTIME_FAILURE).set(false);
+
+ applyUpdate(op, getModelControllerClient());
+ }
}
private ModelControllerClient getModelControllerClient() {
12 years, 1 month
JBossWS SVN: r16120 - in container/jboss71/branches/jbossws-jboss711: src/main/java/org/jboss/as/webservices/tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 12:15:09 -0400 (Fri, 06 Apr 2012)
New Revision: 16120
Added:
container/jboss71/branches/jbossws-jboss711/src/main/resources/META-INF/services/org.jboss.wsf.spi.deployer.Deployer
Modified:
container/jboss71/branches/jbossws-jboss711/pom.xml
container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
Log:
[JBWS-3483] Fixing/synching RemoteDeployer with version shipped in AS 7.1.0.Final + adding missing service declaration + adding transitive dependencies for jbossws testsuite
Modified: container/jboss71/branches/jbossws-jboss711/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss711/pom.xml 2012-04-06 15:53:37 UTC (rev 16119)
+++ container/jboss71/branches/jbossws-jboss711/pom.xml 2012-04-06 16:15:09 UTC (rev 16120)
@@ -26,8 +26,8 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
- <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version>
<jboss.msc.version>1.0.2.GA</jboss.msc.version>
<jboss.version>7.1.1.Final</jboss.version>
<jboss.jaxws.api.version>2.0.0.Final</jboss.jaxws.api.version>
@@ -88,6 +88,24 @@
<version>${jboss.jaxws.api.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- AS specific transitive dependencies for JBossWS testsuite execution -->
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ <version>1.3.11.GA</version>
+ </dependency>
+
</dependencies>
<!-- plugins -->
Modified: container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
===================================================================
--- container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 15:53:37 UTC (rev 16119)
+++ container/jboss71/branches/jbossws-jboss711/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 16:15:09 UTC (rev 16120)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
+ * Copyright 2012, Red Hat, Inc., and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.as.webservices.deployer;
+package org.jboss.as.webservices.tests;
import java.io.IOException;
import java.net.InetAddress;
Added: container/jboss71/branches/jbossws-jboss711/src/main/resources/META-INF/services/org.jboss.wsf.spi.deployer.Deployer
===================================================================
--- container/jboss71/branches/jbossws-jboss711/src/main/resources/META-INF/services/org.jboss.wsf.spi.deployer.Deployer (rev 0)
+++ container/jboss71/branches/jbossws-jboss711/src/main/resources/META-INF/services/org.jboss.wsf.spi.deployer.Deployer 2012-04-06 16:15:09 UTC (rev 16120)
@@ -0,0 +1 @@
+org.jboss.as.webservices.tests.RemoteDeployer
12 years, 1 month
JBossWS SVN: r16119 - container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 11:53:37 -0400 (Fri, 06 Apr 2012)
New Revision: 16119
Modified:
container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
Log:
[JBWS-3482] Changes for supporting concurrent deployments
Modified: container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
===================================================================
--- container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 15:45:04 UTC (rev 16118)
+++ container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 15:53:37 UTC (rev 16119)
@@ -91,6 +91,8 @@
private final InetAddress address = InetAddress.getByName("127.0.0.1");
private final CallbackHandler callbackHandler = getCallbackHandler();
private final ServerDeploymentManager deploymentManager;
+ private final Map<String, Integer> securityDomainUsers = new HashMap<String, Integer>(1);
+ private final Map<String, Integer> archiveCounters = new HashMap<String, Integer>();
public RemoteDeployer() throws IOException {
deploymentManager = ServerDeploymentManager.Factory.create(address, PORT, callbackHandler);
@@ -98,25 +100,48 @@
@Override
public void deploy(final URL archiveURL) throws Exception {
- final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan().add(archiveURL).andDeploy();
- final DeploymentPlan plan = builder.build();
- final DeploymentAction deployAction = builder.getLastAction();
- final String uniqueId = deployAction.getDeploymentUnitUniqueName();
- executeDeploymentPlan(plan, deployAction);
- url2Id.put(archiveURL, uniqueId);
+ synchronized (archiveCounters) {
+ String k = archiveURL.toString();
+ if (archiveCounters.containsKey(k)) {
+ int count = archiveCounters.get(k);
+ archiveCounters.put(k, (count + 1));
+ return;
+ } else {
+ archiveCounters.put(k, 1);
+ }
+
+ final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan().add(archiveURL).andDeploy();
+ final DeploymentPlan plan = builder.build();
+ final DeploymentAction deployAction = builder.getLastAction();
+ final String uniqueId = deployAction.getDeploymentUnitUniqueName();
+ executeDeploymentPlan(plan, deployAction);
+ url2Id.put(archiveURL, uniqueId);
+ }
}
+ @Override
public void undeploy(final URL archiveURL) throws Exception {
- final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan();
- final String uniqueName = url2Id.get(archiveURL);
- if (uniqueName != null) {
- final DeploymentPlan plan = builder.undeploy(uniqueName).remove(uniqueName).build();
- final DeploymentAction deployAction = builder.getLastAction();
- try {
- executeDeploymentPlan(plan, deployAction);
- } finally {
- url2Id.remove(archiveURL);
+ synchronized (archiveCounters) {
+ String k = archiveURL.toString();
+ int count = archiveCounters.get(k);
+ if (count > 1) {
+ archiveCounters.put(k, (count - 1));
+ return;
+ } else {
+ archiveCounters.remove(k);
}
+
+ final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan();
+ final String uniqueName = url2Id.get(archiveURL);
+ if (uniqueName != null) {
+ final DeploymentPlan plan = builder.undeploy(uniqueName).remove(uniqueName).build();
+ final DeploymentAction deployAction = builder.getLastAction();
+ try {
+ executeDeploymentPlan(plan, deployAction);
+ } finally {
+ url2Id.remove(archiveURL);
+ }
+ }
}
}
@@ -148,45 +173,67 @@
return response.get(RESULT).asString();
}
+ @Override
public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception {
- final List<ModelNode> updates = new ArrayList<ModelNode>();
-
- ModelNode op = new ModelNode();
- op.get(OP).set(ADD);
- op.get(OP_ADDR).add(SUBSYSTEM, "security");
- op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- updates.add(op);
-
- op = new ModelNode();
- op.get(OP).set(ADD);
- op.get(OP_ADDR).add(SUBSYSTEM, "security");
- op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- op.get(OP_ADDR).add(AUTHENTICATION, CLASSIC);
-
- final ModelNode loginModule = op.get(LOGIN_MODULES).add();
- loginModule.get(CODE).set("UsersRoles");
- loginModule.get(FLAG).set(REQUIRED);
- op.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
- updates.add(op);
-
- final ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
- if (authenticationOptions != null) {
- for (final String k : authenticationOptions.keySet()) {
- moduleOptions.add(k, authenticationOptions.get(k));
+ synchronized (securityDomainUsers) {
+ if (securityDomainUsers.containsKey(name)) {
+ int count = securityDomainUsers.get(name);
+ securityDomainUsers.put(name, (count + 1));
+ return;
+ } else {
+ securityDomainUsers.put(name, 1);
}
+
+ final List<ModelNode> updates = new ArrayList<ModelNode>();
+
+ ModelNode op = new ModelNode();
+ op.get(OP).set(ADD);
+ op.get(OP_ADDR).add(SUBSYSTEM, "security");
+ op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
+ updates.add(op);
+
+ op = new ModelNode();
+ op.get(OP).set(ADD);
+ op.get(OP_ADDR).add(SUBSYSTEM, "security");
+ op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
+ op.get(OP_ADDR).add(AUTHENTICATION, CLASSIC);
+
+ final ModelNode loginModule = op.get(LOGIN_MODULES).add();
+ loginModule.get(CODE).set("UsersRoles");
+ loginModule.get(FLAG).set(REQUIRED);
+ op.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
+ updates.add(op);
+
+ final ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
+ if (authenticationOptions != null) {
+ for (final String k : authenticationOptions.keySet()) {
+ moduleOptions.add(k, authenticationOptions.get(k));
+ }
+ }
+
+ applyUpdates(updates, getModelControllerClient());
}
-
- applyUpdates(updates, getModelControllerClient());
}
+ @Override
public void removeSecurityDomain(String name) throws Exception {
- final ModelNode op = new ModelNode();
- op.get(OP).set(REMOVE);
- op.get(OP_ADDR).add(SUBSYSTEM, "security");
- op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- op.get(OPERATION_HEADERS, ROLLBACK_ON_RUNTIME_FAILURE).set(false);
-
- applyUpdate(op, getModelControllerClient());
+ synchronized (securityDomainUsers) {
+ int count = securityDomainUsers.get(name);
+ if (count > 1) {
+ securityDomainUsers.put(name, (count - 1));
+ return;
+ } else {
+ securityDomainUsers.remove(name);
+ }
+
+ final ModelNode op = new ModelNode();
+ op.get(OP).set(REMOVE);
+ op.get(OP_ADDR).add(SUBSYSTEM, "security");
+ op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
+ op.get(OPERATION_HEADERS, ROLLBACK_ON_RUNTIME_FAILURE).set(false);
+
+ applyUpdate(op, getModelControllerClient());
+ }
}
private ModelControllerClient getModelControllerClient() {
12 years, 1 month
JBossWS SVN: r16118 - in container/jboss71/branches/jbossws-jboss710: src/main/java/org/jboss/as/webservices/tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 11:45:04 -0400 (Fri, 06 Apr 2012)
New Revision: 16118
Added:
container/jboss71/branches/jbossws-jboss710/src/main/resources/META-INF/services/org.jboss.wsf.spi.deployer.Deployer
Modified:
container/jboss71/branches/jbossws-jboss710/pom.xml
container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
Log:
[JBWS-3483] Fixing/synching RemoteDeployer with version shipped in AS 7.1.0.Final + adding missing service declaration + adding transitive dependencies for jbossws testsuite
Modified: container/jboss71/branches/jbossws-jboss710/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss710/pom.xml 2012-04-06 14:38:25 UTC (rev 16117)
+++ container/jboss71/branches/jbossws-jboss710/pom.xml 2012-04-06 15:45:04 UTC (rev 16118)
@@ -88,6 +88,24 @@
<version>${jboss.jaxws.api.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- AS specific transitive dependencies for JBossWS testsuite execution -->
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ <version>1.3.9.GA</version>
+ </dependency>
+
</dependencies>
<!-- plugins -->
Modified: container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
===================================================================
--- container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 14:38:25 UTC (rev 16117)
+++ container/jboss71/branches/jbossws-jboss710/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 15:45:04 UTC (rev 16118)
@@ -22,23 +22,49 @@
package org.jboss.as.webservices.tests;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOW_RESOURCE_SERVICE_RESTART;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.FAILURE_DESCRIPTION;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.NAME;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OUTCOME;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RELEASE_VERSION;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ROLLBACK_ON_RUNTIME_FAILURE;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUCCESS;
import static org.jboss.as.security.Constants.AUTHENTICATION;
+import static org.jboss.as.security.Constants.CLASSIC;
import static org.jboss.as.security.Constants.CODE;
import static org.jboss.as.security.Constants.FLAG;
+import static org.jboss.as.security.Constants.LOGIN_MODULES;
import static org.jboss.as.security.Constants.MODULE_OPTIONS;
import static org.jboss.as.security.Constants.SECURITY_DOMAIN;
import java.io.IOException;
import java.net.InetAddress;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.sasl.RealmCallback;
+import javax.security.sasl.RealmChoiceCallback;
+
import org.jboss.as.controller.client.ModelControllerClient;
+import org.jboss.as.controller.client.OperationBuilder;
import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
import org.jboss.as.controller.client.helpers.standalone.DeploymentPlan;
import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder;
@@ -59,23 +85,15 @@
private static final Logger LOGGER = Logger.getLogger(RemoteDeployer.class);
private static final int PORT = 9999;
- private static final String JBWS_DEPLOYER_HOST = "jbossws.deployer.host";
- private static final String JBWS_DEPLOYER_PORT = "jbossws.deployer.port";
+ private static final String JBWS_DEPLOYER_AUTH_USER = "jbossws.deployer.authentication.username";
+ private static final String JBWS_DEPLOYER_AUTH_PWD = "jbossws.deployer.authentication.password";
private final Map<URL, String> url2Id = new HashMap<URL, String>();
private final InetAddress address = InetAddress.getByName("127.0.0.1");
+ private final CallbackHandler callbackHandler = getCallbackHandler();
+ private final ServerDeploymentManager deploymentManager;
- private ServerDeploymentManager deploymentManager;
-
public RemoteDeployer() throws IOException {
- final String host = System.getProperty(JBWS_DEPLOYER_HOST);
- InetAddress address;
- if (host != null) {
- address = InetAddress.getByName(host);
- } else {
- address = InetAddress.getByName("localhost");
- }
- final Integer port = Integer.getInteger(JBWS_DEPLOYER_PORT, PORT);
- deploymentManager = ServerDeploymentManager.Factory.create(address, port);
+ deploymentManager = ServerDeploymentManager.Factory.create(address, PORT, callbackHandler);
}
@Override
@@ -88,7 +106,6 @@
url2Id.put(archiveURL, uniqueId);
}
- @Override
public void undeploy(final URL archiveURL) throws Exception {
final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan();
final String uniqueName = url2Id.get(archiveURL);
@@ -108,8 +125,7 @@
final ServerDeploymentPlanResult planResult = deploymentManager.execute(plan).get();
if (deployAction != null) {
- final ServerDeploymentActionResult actionResult = planResult
- .getDeploymentActionResult(deployAction.getId());
+ final ServerDeploymentActionResult actionResult = planResult.getDeploymentActionResult(deployAction.getId());
if (actionResult != null) {
final Exception deploymentException = (Exception) actionResult.getDeploymentException();
if (deploymentException != null)
@@ -122,54 +138,124 @@
}
}
- @Override
- public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception {
- ModelControllerClient client = ModelControllerClient.Factory.create(address, PORT);
- ModelNode result = createSecurityDomain(client, name, authenticationOptions);
- checkResult(result);
- }
+ public String getServerVersion() throws Exception {
+ final ModelNode request = new ModelNode();
+ request.get(OP).set(READ_ATTRIBUTE_OPERATION);
+ request.get(OP_ADDR).setEmptyList();
+ request.get(NAME).set(RELEASE_VERSION);
- @Override
- public void removeSecurityDomain(String name) throws Exception {
- ModelControllerClient client = ModelControllerClient.Factory.create(address, PORT);
- ModelNode result = removeSecurityDomain(client, name);
- checkResult(result);
+ final ModelNode response = applyUpdate(request, getModelControllerClient());
+ return response.get(RESULT).asString();
}
- private static ModelNode createSecurityDomain(ModelControllerClient client, String name, Map<String, String> authenticationOptions) throws IOException {
+ public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception {
+ final List<ModelNode> updates = new ArrayList<ModelNode>();
+
ModelNode op = new ModelNode();
op.get(OP).set(ADD);
op.get(OP_ADDR).add(SUBSYSTEM, "security");
op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- ModelNode loginModule = op.get(AUTHENTICATION).add();
+ updates.add(op);
+
+ op = new ModelNode();
+ op.get(OP).set(ADD);
+ op.get(OP_ADDR).add(SUBSYSTEM, "security");
+ op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
+ op.get(OP_ADDR).add(AUTHENTICATION, CLASSIC);
+
+ final ModelNode loginModule = op.get(LOGIN_MODULES).add();
loginModule.get(CODE).set("UsersRoles");
- loginModule.get(FLAG).set("required");
- ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
+ loginModule.get(FLAG).set(REQUIRED);
+ op.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
+ updates.add(op);
+
+ final ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
if (authenticationOptions != null) {
- for (String k : authenticationOptions.keySet()) {
+ for (final String k : authenticationOptions.keySet()) {
moduleOptions.add(k, authenticationOptions.get(k));
}
}
- return client.execute(op);
+
+ applyUpdates(updates, getModelControllerClient());
}
- private static ModelNode removeSecurityDomain(ModelControllerClient client, String name) throws IOException {
- ModelNode op = new ModelNode();
+ public void removeSecurityDomain(String name) throws Exception {
+ final ModelNode op = new ModelNode();
op.get(OP).set(REMOVE);
op.get(OP_ADDR).add(SUBSYSTEM, "security");
op.get(OP_ADDR).add(SECURITY_DOMAIN, name);
- return client.execute(op);
+ op.get(OPERATION_HEADERS, ROLLBACK_ON_RUNTIME_FAILURE).set(false);
+
+ applyUpdate(op, getModelControllerClient());
}
- private static void checkResult(ModelNode result) throws Exception {
- if (result.hasDefined("outcome") && "success".equals(result.get("outcome").asString())) {
- if (result.hasDefined("result")) {
- LOGGER.info(result.get("result"));
+ private ModelControllerClient getModelControllerClient() {
+ return ModelControllerClient.Factory.create(address, PORT, callbackHandler);
+ }
+
+ private static void applyUpdates(final List<ModelNode> updates, final ModelControllerClient client) throws Exception {
+ for (final ModelNode update : updates) {
+ applyUpdate(update, client);
+ }
+ }
+
+ private static ModelNode applyUpdate(final ModelNode update, final ModelControllerClient client) throws Exception {
+ final ModelNode result = client.execute(new OperationBuilder(update).build());
+ checkResult(result);
+ return result;
+ }
+
+ private static void checkResult(final ModelNode result) throws Exception {
+ if (result.hasDefined(OUTCOME) && SUCCESS.equals(result.get(OUTCOME).asString())) {
+ if (result.hasDefined(RESULT)) {
+ LOGGER.info(result.get(RESULT));
}
- } else if (result.hasDefined("failure-description")) {
- throw new Exception(result.get("failure-description").toString());
+ } else if (result.hasDefined(FAILURE_DESCRIPTION)) {
+ throw new Exception(result.get(FAILURE_DESCRIPTION).toString());
} else {
- throw new Exception("Operation not successful; outcome = " + result.get("outcome"));
+ throw new Exception("Operation not successful; outcome = " + result.get(OUTCOME));
}
}
+
+ private static CallbackHandler getCallbackHandler() {
+ final String username = getSystemProperty(JBWS_DEPLOYER_AUTH_USER, null);
+ if (username == null || ("${" + JBWS_DEPLOYER_AUTH_USER + "}").equals(username)) {
+ return null;
+ }
+ String pwd = getSystemProperty(JBWS_DEPLOYER_AUTH_PWD, null);
+ if (("${" + JBWS_DEPLOYER_AUTH_PWD + "}").equals(pwd)) {
+ pwd = null;
+ }
+ final String password = pwd;
+ return new CallbackHandler() {
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (Callback current : callbacks) {
+ if (current instanceof NameCallback) {
+ NameCallback ncb = (NameCallback) current;
+ ncb.setName(username);
+ } else if (current instanceof PasswordCallback) {
+ PasswordCallback pcb = (PasswordCallback) current;
+ pcb.setPassword(password.toCharArray());
+ } else if (current instanceof RealmCallback) {
+ RealmCallback rcb = (RealmCallback) current;
+ rcb.setText(rcb.getDefaultText());
+ } else if (current instanceof RealmChoiceCallback) {
+ // Ignored but not rejected.
+ } else {
+ throw new UnsupportedCallbackException(current);
+ }
+ }
+ }
+ };
+ }
+
+ private static String getSystemProperty(final String name, final String defaultValue) {
+ PrivilegedAction<String> action = new PrivilegedAction<String>() {
+ public String run() {
+ return System.getProperty(name, defaultValue);
+ }
+ };
+ return AccessController.doPrivileged(action);
+ }
+
}
Added: container/jboss71/branches/jbossws-jboss710/src/main/resources/META-INF/services/org.jboss.wsf.spi.deployer.Deployer
===================================================================
--- container/jboss71/branches/jbossws-jboss710/src/main/resources/META-INF/services/org.jboss.wsf.spi.deployer.Deployer (rev 0)
+++ container/jboss71/branches/jbossws-jboss710/src/main/resources/META-INF/services/org.jboss.wsf.spi.deployer.Deployer 2012-04-06 15:45:04 UTC (rev 16118)
@@ -0,0 +1 @@
+org.jboss.as.webservices.tests.RemoteDeployer
12 years, 1 month
JBossWS SVN: r16117 - container/jboss71/branches/jbossws-jboss710.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 10:38:25 -0400 (Fri, 06 Apr 2012)
New Revision: 16117
Modified:
container/jboss71/branches/jbossws-jboss710/pom.xml
Log:
Updating dependencies
Modified: container/jboss71/branches/jbossws-jboss710/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss710/pom.xml 2012-04-06 14:31:36 UTC (rev 16116)
+++ container/jboss71/branches/jbossws-jboss710/pom.xml 2012-04-06 14:38:25 UTC (rev 16117)
@@ -26,8 +26,8 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
- <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>2.1.0-SNAPSHOT</jbossws.common.version>
<jboss.msc.version>1.0.2.GA</jboss.msc.version>
<jboss.version>7.1.0.Final</jboss.version>
<jboss.jaxws.api.version>2.0.0.Final</jboss.jaxws.api.version>
12 years, 1 month
JBossWS SVN: r16116 - container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/tests.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-04-06 10:31:36 -0400 (Fri, 06 Apr 2012)
New Revision: 16116
Modified:
container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
Log:
[JBWS-3482] Changes for supporting concurrent deployments
Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 14:30:53 UTC (rev 16115)
+++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/tests/RemoteDeployer.java 2012-04-06 14:31:36 UTC (rev 16116)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
+ * Copyright 2012, Red Hat, Inc., and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -61,6 +61,8 @@
private static final int PORT = 9999;
private final Map<URL, String> url2Id = new HashMap<URL, String>();
private final InetAddress address = InetAddress.getByName("127.0.0.1");
+ private final Map<String, Integer> securityDomainUsers = new HashMap<String, Integer>(1);
+ private final Map<String, Integer> archiveCounters = new HashMap<String, Integer>();
private ServerDeploymentManager deploymentManager;
@@ -70,26 +72,48 @@
@Override
public void deploy(final URL archiveURL) throws Exception {
- final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan().add(archiveURL).andDeploy();
- final DeploymentPlan plan = builder.build();
- final DeploymentAction deployAction = builder.getLastAction();
- final String uniqueId = deployAction.getDeploymentUnitUniqueName();
- executeDeploymentPlan(plan, deployAction);
- url2Id.put(archiveURL, uniqueId);
+ synchronized (archiveCounters) {
+ String k = archiveURL.toString();
+ if (archiveCounters.containsKey(k)) {
+ int count = archiveCounters.get(k);
+ archiveCounters.put(k, (count + 1));
+ return;
+ } else {
+ archiveCounters.put(k, 1);
+ }
+
+ final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan().add(archiveURL).andDeploy();
+ final DeploymentPlan plan = builder.build();
+ final DeploymentAction deployAction = builder.getLastAction();
+ final String uniqueId = deployAction.getDeploymentUnitUniqueName();
+ executeDeploymentPlan(plan, deployAction);
+ url2Id.put(archiveURL, uniqueId);
+ }
}
@Override
public void undeploy(final URL archiveURL) throws Exception {
- final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan();
- final String uniqueName = url2Id.get(archiveURL);
- if (uniqueName != null) {
- final DeploymentPlan plan = builder.undeploy(uniqueName).remove(uniqueName).build();
- final DeploymentAction deployAction = builder.getLastAction();
- try {
- executeDeploymentPlan(plan, deployAction);
- } finally {
- url2Id.remove(archiveURL);
+ synchronized (archiveCounters) {
+ String k = archiveURL.toString();
+ int count = archiveCounters.get(k);
+ if (count > 1) {
+ archiveCounters.put(k, (count - 1));
+ return;
+ } else {
+ archiveCounters.remove(k);
}
+
+ final DeploymentPlanBuilder builder = deploymentManager.newDeploymentPlan();
+ final String uniqueName = url2Id.get(archiveURL);
+ if (uniqueName != null) {
+ final DeploymentPlan plan = builder.undeploy(uniqueName).remove(uniqueName).build();
+ final DeploymentAction deployAction = builder.getLastAction();
+ try {
+ executeDeploymentPlan(plan, deployAction);
+ } finally {
+ url2Id.remove(archiveURL);
+ }
+ }
}
}
@@ -114,16 +138,36 @@
@Override
public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception {
- ModelControllerClient client = ModelControllerClient.Factory.create(address, PORT);
- ModelNode result = createSecurityDomain(client, name, authenticationOptions);
- checkResult(result);
+ synchronized (securityDomainUsers) {
+ if (securityDomainUsers.containsKey(name)) {
+ int count = securityDomainUsers.get(name);
+ securityDomainUsers.put(name, (count + 1));
+ return;
+ } else {
+ securityDomainUsers.put(name, 1);
+ }
+
+ ModelControllerClient client = ModelControllerClient.Factory.create(address, PORT);
+ ModelNode result = createSecurityDomain(client, name, authenticationOptions);
+ checkResult(result);
+ }
}
@Override
public void removeSecurityDomain(String name) throws Exception {
- ModelControllerClient client = ModelControllerClient.Factory.create(address, PORT);
- ModelNode result = removeSecurityDomain(client, name);
- checkResult(result);
+ synchronized (securityDomainUsers) {
+ int count = securityDomainUsers.get(name);
+ if (count > 1) {
+ securityDomainUsers.put(name, (count - 1));
+ return;
+ } else {
+ securityDomainUsers.remove(name);
+ }
+
+ ModelControllerClient client = ModelControllerClient.Factory.create(address, PORT);
+ ModelNode result = removeSecurityDomain(client, name);
+ checkResult(result);
+ }
}
private static ModelNode createSecurityDomain(ModelControllerClient client, String name, Map<String, String> authenticationOptions) throws IOException {
12 years, 1 month