Author: rsearls Date: 2014-08-08 09:29:35 -0400 (Fri, 08 Aug 2014) New Revision: 18832 Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java Log: [JBWS-3750] reverting commit to revision: 18812 Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-08-08 08:51:48 UTC (rev 18831) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-08-08 13:29:35 UTC (rev 18832) @@ -52,7 +52,6 @@ private final DMRSynchCheckHandler webServicePortUCH = new DMRSynchCheckHandler(); private final DMRSynchCheckHandler webServiceSecurePortUCH = new DMRSynchCheckHandler(); private final DMRSynchCheckHandler modifySOAPAddressUCH = new DMRSynchCheckHandler(); - private final DMRSynchCheckHandler webServicePathRewriteRuleUCH = new DMRSynchCheckHandler(); private ServerConfigImpl() { // forbidden inheritance @@ -66,7 +65,6 @@ webServicePortUCH.reset(); webServiceSecurePortUCH.reset(); modifySOAPAddressUCH.reset(); - webServicePathRewriteRuleUCH.reset(); } public void incrementWSDeploymentCount() { @@ -91,15 +89,6 @@ setWebServiceHost(host, webServiceHostUCH); } - public void setWebServicePathRewriteRule(String path, boolean forceUpdate) { - setWebServicePathRewriteRule(path, forceUpdate ? null : webServicePathRewriteRuleUCH); - } - - @Override - public void setWebServicePathRewriteRule(String path) { - setWebServicePathRewriteRule(path, webServicePathRewriteRuleUCH); - } - public void setWebServicePort(int port, boolean forceUpdate) { setWebServicePort(port, forceUpdate ? null : webServicePortUCH); } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-08-08 08:51:48 UTC (rev 18831) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Attributes.java 2014-08-08 13:29:35 UTC (rev 18832) @@ -61,14 +61,8 @@ .setDefaultValue(new ModelNode(true)) .setAllowExpression(true) .build(); + SimpleAttributeDefinition[] SUBSYSTEM_ATTRIBUTES = {MODIFY_WSDL_ADDRESS, WSDL_HOST, WSDL_PORT, WSDL_SECURE_PORT}; - 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, WSDL_PATH_REWRITE_RULE}; - SimpleAttributeDefinition VALUE = new SimpleAttributeDefinitionBuilder(Constants.VALUE, ModelType.STRING) .setAllowNull(true) .setAllowExpression(true) @@ -83,4 +77,5 @@ .setAllowExpression(true) .build(); + } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-08-08 08:51:48 UTC (rev 18831) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Constants.java 2014-08-08 13:29:35 UTC (rev 18832) @@ -55,5 +55,4 @@ String HANDLER_NAME="handler-name"; String HANDLER_CLASS="handler-class"; String VALUE = "value"; - String WSDL_PATH_REWRITE_RULE = "wsdl-path-rewrite-rule"; } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-08-08 08:51:48 UTC (rev 18831) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/Element.java 2014-08-08 13:29:35 UTC (rev 18832) @@ -39,7 +39,6 @@ WSDL_HOST(Constants.WSDL_HOST), WSDL_PORT(Constants.WSDL_PORT), WSDL_SECURE_PORT(Constants.WSDL_SECURE_PORT), - 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/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java 2014-08-08 08:51:48 UTC (rev 18831) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java 2014-08-08 13:29:35 UTC (rev 18832) @@ -25,7 +25,6 @@ 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.WSDL_PATH_REWRITE_RULE; import java.net.UnknownHostException; @@ -108,9 +107,6 @@ } else if (WSDL_SECURE_PORT.equals(attributeName)) { final int securePort = value != null ? Integer.parseInt(value) : -1; config.setWebServiceSecurePort(securePort, isRevert); - } else if (WSDL_PATH_REWRITE_RULE.equals(attributeName)) { - final String path = value != null ? value : null; - config.setWebServicePathRewriteRule(path, isRevert); } else { throw new IllegalArgumentException(attributeName); } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-08-08 08:51:48 UTC (rev 18831) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-08-08 13:29:35 UTC (rev 18832) @@ -26,7 +26,6 @@ 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.WSDL_PATH_REWRITE_RULE; import java.net.UnknownHostException; import java.util.ArrayList; @@ -113,9 +112,6 @@ if (configuration.hasDefined(WSDL_SECURE_PORT)) { config.setWebServiceSecurePort(Attributes.WSDL_SECURE_PORT.resolveModelAttribute(context, configuration).asInt()); } - if (configuration.hasDefined(WSDL_PATH_REWRITE_RULE)) { - config.setWebServicePathRewriteRule(Attributes.WSDL_PATH_REWRITE_RULE.resolveModelAttribute(context, configuration).asString()); - } return config; } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-08-08 08:51:48 UTC (rev 18831) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemReader.java 2014-08-08 13:29:35 UTC (rev 18832) @@ -140,11 +140,6 @@ Attributes.WSDL_SECURE_PORT.parseAndSetParameter(value, subsystem, reader); break; } - case WSDL_PATH_REWRITE_RULE: { - final String value = parseElementNoAttributes(reader); - Attributes.WSDL_PATH_REWRITE_RULE.parseAndSetParameter(value, subsystem, reader); - break; - } case ENDPOINT_CONFIG: { readConfig(reader, address, endpointConfigs, false); break; Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-08-08 08:51:48 UTC (rev 18831) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-08-08 13:29:35 UTC (rev 18832) @@ -92,12 +92,6 @@ sc.setWebServiceSecurePort(5435); } }); - internalTestSingleAttributeUpdate(new Callback() { - @Override - public void setAttribute(ServerConfig sc) throws Exception { - sc.setWebServicePathRewriteRule("MY/TEST/PATH"); - } - }); } @Test @@ -126,17 +120,10 @@ sc.setWebServiceSecurePort(5435); } }; - Callback cbE = new Callback() { - @Override - public void setAttribute(ServerConfig sc) throws Exception { - sc.setWebServicePathRewriteRule("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}); + 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}); } protected void internalTestSingleAttributeUpdate(Callback cb) throws Exception {