[jbossws-commits] JBossWS SVN: r18617 - in container/wildfly80/branches/rsearls: server-integration and 4 other directories.

Author: rsearls Date: 2014-05-06 10:59:50 -0400 (Tue, 06 May 2014) New Revision: 18617 Modified: container/wildfly80/branches/rsearls/pom.xml container/wildfly80/branches/rsearls/server-integration/pom.xml container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java container/wildfly80/branches/rsearls/tests-integration/pom.xml Log: [JBWS-3750] new code and corresponding tests Modified: container/wildfly80/branches/rsearls/pom.xml =================================================================== --- container/wildfly80/branches/rsearls/pom.xml 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/pom.xml 2014-05-06 14:59:50 UTC (rev 18617) @@ -35,7 +35,7 @@ <description>JBossWS WildFly 8.0.0.Final Integration Parent</description> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-wildfly800-parent</artifactId> - <version>4.3.0.Final</version> + <version>4.3.1-SNAPSHOT</version> <packaging>pom</packaging> <scm> @@ -51,8 +51,8 @@ <properties> <jbossws.api.version>1.0.2.Final</jbossws.api.version> - <jbossws.spi.version>2.3.0.Final</jbossws.spi.version> - <jbossws.common.version>2.3.0.Final</jbossws.common.version> + <jbossws.spi.version>2.3.2-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>2.3.2-SNAPSHOT</jbossws.common.version> <jboss.msc.version>1.2.0.Final</jboss.msc.version> <wildfly.version>8.0.0.Final</wildfly.version> <wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version> Modified: container/wildfly80/branches/rsearls/server-integration/pom.xml =================================================================== --- container/wildfly80/branches/rsearls/server-integration/pom.xml 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/server-integration/pom.xml 2014-05-06 14:59:50 UTC (rev 18617) @@ -29,7 +29,7 @@ <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-wildfly800-parent</artifactId> - <version>4.3.0.Final</version> + <version>4.3.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-05-06 14:59:50 UTC (rev 18617) @@ -52,6 +52,7 @@ private final DMRSynchCheckHandler webServicePortUCH = new DMRSynchCheckHandler(); private final DMRSynchCheckHandler webServiceSecurePortUCH = new DMRSynchCheckHandler(); private final DMRSynchCheckHandler modifySOAPAddressUCH = new DMRSynchCheckHandler(); + private final DMRSynchCheckHandler webServicePathUCH = new DMRSynchCheckHandler(); private ServerConfigImpl() { // forbidden inheritance @@ -65,6 +66,7 @@ webServicePortUCH.reset(); webServiceSecurePortUCH.reset(); modifySOAPAddressUCH.reset(); + webServicePathUCH.reset(); } public void incrementWSDeploymentCount() { @@ -89,6 +91,15 @@ setWebServiceHost(host, webServiceHostUCH); } + public void setWebServicePath(String path, boolean forceUpdate) { + setWebServicePath(path, forceUpdate ? null : webServicePathUCH); + } + + @Override + public void setWebServicePath(String path) { + setWebServicePath(path, webServicePathUCH); + } + public void setWebServicePort(int port, boolean forceUpdate) { setWebServicePort(port, forceUpdate ? null : webServicePortUCH); } Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-05-06 14:59:50 UTC (rev 18617) @@ -27,6 +27,7 @@ import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.as.controller.operations.validation.IntRangeValidator; +import org.jboss.as.controller.operations.validation.StringLengthValidator; import org.jboss.dmr.ModelNode; import org.jboss.dmr.ModelType; @@ -61,8 +62,16 @@ .setDefaultValue(new ModelNode(true)) .setAllowExpression(true) .build(); - SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT}; + SimpleAttributeDefinition PATH = new SimpleAttributeDefinitionBuilder(Constants.PATH, ModelType.STRING) + .setAllowNull(true) + .setMinSize(1) + .setAllowExpression(false) + .setValidator(new StringLengthValidator(1, Integer.MAX_VALUE, true, true)) + .build(); + + SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT, PATH}; + SimpleAttributeDefinition VALUE = new SimpleAttributeDefinitionBuilder(Constants.VALUE, ModelType.STRING) .setAllowNull(true) .setAllowExpression(true) @@ -77,5 +86,4 @@ .setAllowExpression(true) .build(); - } Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-05-06 14:59:50 UTC (rev 18617) @@ -55,4 +55,5 @@ String HANDLER_NAME="handler-name"; String HANDLER_CLASS="handler-class"; String VALUE = "value"; + String PATH = "path"; } Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-05-06 14:59:50 UTC (rev 18617) @@ -39,6 +39,7 @@ WSDL_HOST(Constants.WSDL_HOST), WSDL_PORT(Constants.WSDL_PORT), WSDL_SECURE_PORT(Constants.WSDL_SECURE_PORT), + PATH(Constants.PATH), CLIENT_CONFIG(Constants.CLIENT_CONFIG), ENDPOINT_CONFIG(Constants.ENDPOINT_CONFIG), CONFIG_NAME(Constants.CONFIG_NAME), Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-05-06 14:59:50 UTC (rev 18617) @@ -26,6 +26,7 @@ import static org.jboss.as.webservices.dmr.Constants.WSDL_HOST; import static org.jboss.as.webservices.dmr.Constants.WSDL_PORT; import static org.jboss.as.webservices.dmr.Constants.WSDL_SECURE_PORT; +import static org.jboss.as.webservices.dmr.Constants.PATH; import java.net.UnknownHostException; import java.util.ArrayList; @@ -112,6 +113,9 @@ if (configuration.hasDefined(WSDL_SECURE_PORT)) { config.setWebServiceSecurePort(Attributes.WSDL_SECURE_PORT.resolveModelAttribute(context, configuration).asInt()); } + if (configuration.hasDefined(PATH)) { + config.setWebServicePath(Attributes.PATH.resolveModelAttribute(context, configuration).asString()); + } return config; } Modified: container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-05-06 14:59:50 UTC (rev 18617) @@ -140,6 +140,11 @@ Attributes.WSDL_SECURE_PORT.parseAndSetParameter(value, subsystem, reader); break; } + case PATH: { + final String value = parseElementNoAttributes(reader); + Attributes.PATH.parseAndSetParameter(value, subsystem, reader); + break; + } case ENDPOINT_CONFIG: { readConfig(reader, address, endpointConfigs, false); break; Modified: container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-05-06 14:59:50 UTC (rev 18617) @@ -92,6 +92,12 @@ sc.setWebServiceSecurePort(5435); } }); + internalTestSingleAttributeUpdate(new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setWebServicePath("MY/TEST/PATH"); + } + }); } @Test @@ -120,10 +126,17 @@ sc.setWebServiceSecurePort(5435); } }; - internalTestMultipleAttributeUpdate(cbA, new Callback[]{cbB, cbC, cbD}); - internalTestMultipleAttributeUpdate(cbB, new Callback[]{cbA, cbC, cbD}); - internalTestMultipleAttributeUpdate(cbC, new Callback[]{cbA, cbB, cbD}); - internalTestMultipleAttributeUpdate(cbD, new Callback[]{cbA, cbB, cbC}); + Callback cbE = new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setWebServicePath("MY/TEST/PATH"); + } + }; + internalTestMultipleAttributeUpdate(cbA, new Callback[]{cbB, cbC, cbD, cbE}); + internalTestMultipleAttributeUpdate(cbB, new Callback[]{cbA, cbC, cbD, cbE}); + internalTestMultipleAttributeUpdate(cbC, new Callback[]{cbA, cbB, cbD, cbE}); + internalTestMultipleAttributeUpdate(cbD, new Callback[]{cbA, cbB, cbC, cbE}); + internalTestMultipleAttributeUpdate(cbE, new Callback[]{cbA, cbB, cbC, cbD}); } protected void internalTestSingleAttributeUpdate(Callback cb) throws Exception { Modified: container/wildfly80/branches/rsearls/tests-integration/pom.xml =================================================================== --- container/wildfly80/branches/rsearls/tests-integration/pom.xml 2014-05-06 13:46:44 UTC (rev 18616) +++ container/wildfly80/branches/rsearls/tests-integration/pom.xml 2014-05-06 14:59:50 UTC (rev 18617) @@ -29,7 +29,7 @@ <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-wildfly800-parent</artifactId> - <version>4.3.0.Final</version> + <version>4.3.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>