JBossWS SVN: r18425 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-02-24 09:15:02 -0500 (Mon, 24 Feb 2014)
New Revision: 18425
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3766] Prevent JDK8 failure due to null value in concurrent hash map
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-02-24 14:08:58 UTC (rev 18424)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-02-24 14:15:02 UTC (rev 18425)
@@ -268,7 +268,10 @@
result.setServiceName(new QName(serviceNS, serviceName));
Map<String, Object> props = new HashMap<String, Object>();
for (String k : ep.getProperties()) {
- props.put(k, ep.getProperty(k));
+ final Object v = ep.getProperty(k);
+ if (v != null) { //do not add null props [JBWS-3766]
+ props.put(k, v);
+ }
}
result.setProperties(props);
if (!missingServicePortAttr && annWsdlLocation.length() > 0) {
10 years, 2 months
JBossWS SVN: r18424 - stack/cxf/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 09:08:58 -0500 (Mon, 24 Feb 2014)
New Revision: 18424
Removed:
stack/cxf/tags/jbossws-cxf-4.3.0.CR1/
Log:
Remove the tag
10 years, 2 months
JBossWS SVN: r18423 - stack/cxf/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 09:03:37 -0500 (Mon, 24 Feb 2014)
New Revision: 18423
Added:
stack/cxf/tags/jbossws-cxf-4.3.0.CR1/
Log:
Tag jbossws-cxf-4.3.0.CR1
10 years, 2 months
JBossWS SVN: r18422 - container/wildfly80/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 08:54:49 -0500 (Mon, 24 Feb 2014)
New Revision: 18422
Added:
container/wildfly80/tags/jbossws-wildfly800-4.3.0.CR1/
Log:
Tag jbossws-wildfly800-4.3.0.CR1
10 years, 2 months
JBossWS SVN: r18421 - container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 08:51:48 -0500 (Mon, 24 Feb 2014)
New Revision: 18421
Modified:
container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
Log:
[JBWS-3767]:Add addJaspiSecurityDomain sigature
Modified: container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-02-24 13:48:00 UTC (rev 18420)
+++ container/wildfly80/branches/jbossws-wildfly800/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-02-24 13:51:48 UTC (rev 18421)
@@ -81,7 +81,11 @@
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.AUTH_MODULE;
+import static org.jboss.as.security.Constants.JASPI;
import static org.jboss.as.security.Constants.LOGIN_MODULE;
+import static org.jboss.as.security.Constants.LOGIN_MODULE_STACK;
+import static org.jboss.as.security.Constants.LOGIN_MODULE_STACK_REF;
import static org.jboss.as.security.Constants.MODULE_OPTIONS;
import static org.jboss.as.security.Constants.SECURITY_DOMAIN;
@@ -90,6 +94,7 @@
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ * @author <a href="mailto:ema@redhat.com">Alessio Soldano</a>
*/
public final class RemoteDeployer implements Deployer {
@@ -256,6 +261,67 @@
}
}
+ public void addJaspiSecurityDomain(String name, String loginModuleStackName, Map<String, String> loginModuleOptions,
+ String authModuleName, Map<String, String> authModuleOptions) throws Exception {
+ 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>();
+
+ final ModelNode compositeOp = new ModelNode();
+ compositeOp.get(OP).set(COMPOSITE);
+ compositeOp.get(OP_ADDR).setEmptyList();
+ compositeOp.get(OPERATION_HEADERS, ALLOW_RESOURCE_SERVICE_RESTART).set(true);
+
+ ModelNode steps = compositeOp.get(STEPS);
+ PathAddress address = PathAddress.pathAddress().append(SUBSYSTEM, "security").append(SECURITY_DOMAIN, name);
+ steps.add(Util.createAddOperation(address));
+
+ PathAddress parentAddress = address.append(AUTHENTICATION, JASPI);
+ steps.add(Util.createAddOperation(parentAddress));
+
+ // step 3
+ PathAddress loignStackAddress = parentAddress.append(LOGIN_MODULE_STACK, loginModuleStackName);
+ ModelNode loginStack = Util.createAddOperation(loignStackAddress);
+ steps.add(loginStack);
+
+ // step 4
+ ModelNode loginModule = Util.createAddOperation(loignStackAddress.append(LOGIN_MODULE, "UsersRoles"));
+ loginModule.get(CODE).set("UsersRoles");
+ loginModule.get(FLAG).set(REQUIRED);
+ loginModule.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true);
+ final ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS);
+ if (loginModuleOptions != null) {
+ for (final String k : loginModuleOptions.keySet()) {
+ moduleOptions.add(k, loginModuleOptions.get(k));
+ }
+ }
+ steps.add(loginModule);
+
+ PathAddress authModule = parentAddress.append(AUTH_MODULE, authModuleName);
+ ModelNode authModuleNode = Util.createAddOperation(authModule);
+ authModuleNode.get(LOGIN_MODULE_STACK_REF).set(loginModuleStackName);
+ authModuleNode.get(CODE).set(authModuleName);
+ ModelNode options = authModuleNode.get(MODULE_OPTIONS);
+ if (authModuleOptions != null) {
+ for (final String k : authModuleOptions.keySet()) {
+ options.add(k, authModuleOptions.get(k));
+ }
+ }
+ steps.add(authModuleNode);
+
+ updates.add(compositeOp);
+
+ applyUpdates(updates);
+ }
+ }
+
@Override
public void removeSecurityDomain(String name) throws Exception {
synchronized (securityDomainUsers) {
10 years, 2 months
JBossWS SVN: r18420 - in container/jboss72/tags/jbossws-jboss720-4.3.0.CR1: tests-integration/src/main/java/org/jboss/as/webservices/deployer and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 08:48:00 -0500 (Mon, 24 Feb 2014)
New Revision: 18420
Modified:
container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/
container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/pom.xml
container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
Log:
Update the tag version;Add the addjaspiSecurityDomain signature in RemoteDeployer
Property changes on: container/jboss72/tags/jbossws-jboss720-4.3.0.CR1
___________________________________________________________________
Added: svn:mergeinfo
+ /container/jboss72/branches/jbossws-jboss720:18418-18419
Modified: container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/pom.xml
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/pom.xml 2014-02-24 13:43:29 UTC (rev 18419)
+++ container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/pom.xml 2014-02-24 13:48:00 UTC (rev 18420)
@@ -51,8 +51,8 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>2.3.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.3.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>2.3.0.CR1</jbossws.spi.version>
+ <jbossws.common.version>2.3.0.CR1</jbossws.common.version>
<jboss.msc.version>1.0.4.GA</jboss.msc.version>
<jboss.version>7.2.0.Final</jboss.version>
<jboss.jaxws.api.version>2.0.2.Final</jboss.jaxws.api.version>
Modified: container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
===================================================================
--- container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-02-24 13:43:29 UTC (rev 18419)
+++ container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-02-24 13:48:00 UTC (rev 18420)
@@ -389,5 +389,11 @@
private static ServerDeploymentManager newDeploymentManager(ModelControllerClient client) throws Exception {
return ServerDeploymentManager.Factory.create(client);
}
+
+ @Override
+ public void addJaspiSecurityDomain(String name, String loginModuleStackName, Map<String, String> loginModuleOptions,
+ String authModuleName, Map<String, String> authModuleOptions) throws Exception {
+ throw new UnsupportedOperationException("Jaspi authenticaiton is only supported after Wildfly-8.0.0.Final");
+ }
}
10 years, 2 months
JBossWS SVN: r18419 - container/jboss72/branches/jbossws-jboss720/tests-integration/src/main/java/org/jboss/as/webservices/deployer.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 08:43:29 -0500 (Mon, 24 Feb 2014)
New Revision: 18419
Modified:
container/jboss72/branches/jbossws-jboss720/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
Log:
Throw UnsupportedOperationException for addJaspiSecurityDomain in RemoteDeployer
Modified: container/jboss72/branches/jbossws-jboss720/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-02-24 13:25:58 UTC (rev 18418)
+++ container/jboss72/branches/jbossws-jboss720/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-02-24 13:43:29 UTC (rev 18419)
@@ -389,5 +389,11 @@
private static ServerDeploymentManager newDeploymentManager(ModelControllerClient client) throws Exception {
return ServerDeploymentManager.Factory.create(client);
}
+
+ @Override
+ public void addJaspiSecurityDomain(String name, String loginModuleStackName, Map<String, String> loginModuleOptions,
+ String authModuleName, Map<String, String> authModuleOptions) throws Exception {
+ throw new UnsupportedOperationException("Jaspi authenticaiton is only supported after Wildfly-8.0.0.Final");
+ }
}
10 years, 2 months
JBossWS SVN: r18418 - container/jboss72/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 08:25:58 -0500 (Mon, 24 Feb 2014)
New Revision: 18418
Added:
container/jboss72/tags/jbossws-jboss720-4.3.0.CR1/
Log:
Tag jbossws-jboss720-4.3.0.CR1
10 years, 2 months
JBossWS SVN: r18417 - common/tags/jbossws-common-2.3.0.CR1.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 08:17:48 -0500 (Mon, 24 Feb 2014)
New Revision: 18417
Modified:
common/tags/jbossws-common-2.3.0.CR1/pom.xml
Log:
Update tag version
Modified: common/tags/jbossws-common-2.3.0.CR1/pom.xml
===================================================================
--- common/tags/jbossws-common-2.3.0.CR1/pom.xml 2014-02-24 13:12:48 UTC (rev 18416)
+++ common/tags/jbossws-common-2.3.0.CR1/pom.xml 2014-02-24 13:17:48 UTC (rev 18417)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<description>JBossWS Common</description>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.0.CR1</version>
<!-- Parent -->
<parent>
@@ -27,7 +27,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.3.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>2.3.0.CR1</jbossws.spi.version>
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
<jboss-logging.version>3.1.2.GA</jboss-logging.version>
10 years, 2 months
JBossWS SVN: r18416 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-02-24 08:12:48 -0500 (Mon, 24 Feb 2014)
New Revision: 18416
Added:
common/tags/jbossws-common-2.3.0.CR1/
Log:
Tag jbossws-common-2.3.0.CR1
10 years, 2 months