[jbossws-commits] JBossWS SVN: r18708 - in container/wildfly80/branches/rsearls/server-integration/src: main/java/org/jboss/as/webservices/dmr and 1 other directories.

Author: rsearls Date: 2014-06-02 11:43:58 -0400 (Mon, 02 Jun 2014) New Revision: 18708 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/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/WSServerConfigAttributeHandler.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 Log: webservicePath attr revised webServicePathRewriteRule 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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -52,7 +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 final DMRSynchCheckHandler webServicePathRewriteRuleUCH = new DMRSynchCheckHandler(); private ServerConfigImpl() { // forbidden inheritance @@ -66,7 +66,7 @@ webServicePortUCH.reset(); webServiceSecurePortUCH.reset(); modifySOAPAddressUCH.reset(); - webServicePathUCH.reset(); + webServicePathRewriteRuleUCH.reset(); } public void incrementWSDeploymentCount() { @@ -91,13 +91,13 @@ setWebServiceHost(host, webServiceHostUCH); } - public void setWebServicePath(String path, boolean forceUpdate) { - setWebServicePath(path, forceUpdate ? null : webServicePathUCH); + public void setWebServicePathRewriteRule(String path, boolean forceUpdate) { + setWebServicePathRewriteRule(path, forceUpdate ? null : webServicePathRewriteRuleUCH); } @Override - public void setWebServicePath(String path) { - setWebServicePath(path, webServicePathUCH); + public void setWebServicePathRewriteRule(String path) { + setWebServicePathRewriteRule(path, webServicePathRewriteRuleUCH); } public void setWebServicePort(int port, boolean forceUpdate) { 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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -62,12 +62,12 @@ .setAllowExpression(true) .build(); - SimpleAttributeDefinition PATH = new SimpleAttributeDefinitionBuilder(Constants.PATH, ModelType.STRING) + SimpleAttributeDefinition WSDL_PATH_REWRITE_RULE = new SimpleAttributeDefinitionBuilder(Constants.WSDL_PATH_REWRITE_RULE, ModelType.STRING) .setAllowNull(true) .setAllowExpression(false) .build(); - SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT, PATH}; + SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT, WSDL_PATH_REWRITE_RULE}; SimpleAttributeDefinition VALUE = new SimpleAttributeDefinitionBuilder(Constants.VALUE, ModelType.STRING) .setAllowNull(true) 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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -55,5 +55,5 @@ String HANDLER_NAME="handler-name"; String HANDLER_CLASS="handler-class"; String VALUE = "value"; - String PATH = "path"; + String WSDL_PATH_REWRITE_RULE = "wsdl-path-rewrite-rule"; } 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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -39,7 +39,7 @@ WSDL_HOST(Constants.WSDL_HOST), WSDL_PORT(Constants.WSDL_PORT), WSDL_SECURE_PORT(Constants.WSDL_SECURE_PORT), - PATH(Constants.PATH), + WSDL_PATH_REWRITE_RULE(Constants.WSDL_PATH_REWRITE_RULE), 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/WSServerConfigAttributeHandler.java =================================================================== --- container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java 2014-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -104,9 +104,9 @@ } else if (WSDL_SECURE_PORT.equals(attributeName)) { final int securePort = value != null ? Integer.parseInt(value) : -1; config.setWebServiceSecurePort(securePort, isRevert); - } else if (PATH.equals(attributeName)) { + } else if (WSDL_PATH_REWRITE_RULE.equals(attributeName)) { final String path = value != null ? value : null; - config.setWebServicePath(path, isRevert); + config.setWebServicePathRewriteRule(path, isRevert); } else { throw new IllegalArgumentException(attributeName); } 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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -26,7 +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 static org.jboss.as.webservices.dmr.Constants.WSDL_PATH_REWRITE_RULE; import java.net.UnknownHostException; import java.util.ArrayList; @@ -113,8 +113,8 @@ 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()); + if (configuration.hasDefined(WSDL_PATH_REWRITE_RULE)) { + config.setWebServicePathRewriteRule(Attributes.WSDL_PATH_REWRITE_RULE.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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -140,9 +140,9 @@ Attributes.WSDL_SECURE_PORT.parseAndSetParameter(value, subsystem, reader); break; } - case PATH: { + case WSDL_PATH_REWRITE_RULE: { final String value = parseElementNoAttributes(reader); - Attributes.PATH.parseAndSetParameter(value, subsystem, reader); + Attributes.WSDL_PATH_REWRITE_RULE.parseAndSetParameter(value, subsystem, reader); break; } case ENDPOINT_CONFIG: { 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-06-02 15:43:33 UTC (rev 18707) +++ container/wildfly80/branches/rsearls/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-06-02 15:43:58 UTC (rev 18708) @@ -95,7 +95,7 @@ internalTestSingleAttributeUpdate(new Callback() { @Override public void setAttribute(ServerConfig sc) throws Exception { - sc.setWebServicePath("MY/TEST/PATH"); + sc.setWebServicePathRewriteRule("MY/TEST/PATH"); } }); } @@ -129,7 +129,7 @@ Callback cbE = new Callback() { @Override public void setAttribute(ServerConfig sc) throws Exception { - sc.setWebServicePath("MY/TEST/PATH"); + sc.setWebServicePathRewriteRule("MY/TEST/PATH"); } }; internalTestMultipleAttributeUpdate(cbA, new Callback[]{cbB, cbC, cbD, cbE});