Author: darran.lofthouse(a)jboss.com Date: 2010-12-03 12:41:47 -0500 (Fri, 03 Dec 2010) New Revision: 13407 Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/Endpoint.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/EndpointImpl.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/JBPAPP2143TestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/META-INF/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/META-INF/jbpapp2143-client-config.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/web.xml Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml Log: [JBPAPP-2143] Setting a new config at runtime the properties are not available to RemotingConnectionImpl Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2010-12-03 13:31:23 UTC (rev 13406) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2010-12-03 17:41:47 UTC (rev 13407) @@ -25,6 +25,7 @@ import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource; import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; @@ -62,6 +63,8 @@ private EndpointMetaData epMetaData; // The operation for this message ctx private OperationMetaData opMetaData; + // The configuration to override the default configuration wrapped by EndpointMetaData. + private CommonConfig config; // The Message in this message context private MessageAbstraction message; // The map of scoped properties @@ -119,6 +122,21 @@ this.opMetaData = opMetaData; } + public CommonConfig getConfig() + { + if (config == null) + { + config = epMetaData.getConfig(); + } + + return config; + } + + public void setConfig(CommonConfig config) + { + this.config = config; + } + public SOAPMessage getSOAPMessage() { if(message!=null && ((message instanceof SOAPMessage) == false)) Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2010-12-03 13:31:23 UTC (rev 13406) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2010-12-03 17:41:47 UTC (rev 13407) @@ -307,7 +307,7 @@ if (msgContext != null) { EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); - CommonConfig config = epMetaData.getConfig(); + CommonConfig config = msgContext.getConfig(); String sizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE); if (sizeValue != null) Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2010-12-03 13:31:23 UTC (rev 13406) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2010-12-03 17:41:47 UTC (rev 13407) @@ -215,6 +215,7 @@ { // Associate a message context with the current thread CommonMessageContext msgContext = new SOAPMessageContextJAXWS(); + msgContext.setConfig(this.epConfigMetaData.getConfig()); MessageContextAssociation.pushMessageContext(msgContext); try @@ -399,7 +400,19 @@ initBindingHandlerChain(true); } } + + @Override + public String getConfigFile() + { + return epConfigMetaData.getConfigFile(); + } + @Override + public String getConfigName() + { + return epConfigMetaData.getConfigName(); + } + /** * Retrieve header names that can be processed by this binding * @return Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-12-03 13:31:23 UTC (rev 13406) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-12-03 17:41:47 UTC (rev 13407) @@ -142,6 +142,18 @@ </webinf> </war> + <!-- jaxws-jbpapp2143 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbpapp2143.war" webxml="${tests.output.dir}/test-resources/jaxws/jbpapp2143/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbpapp2143/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbpapp2143/*TestCase.class" /> + </classes> + + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbpapp2143/WEB-INF"> + <include name="*.xml" /> + </webinf> + </war> + <!-- jaxws-jbpapp3389 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbpapp3389.war" webxml="${tests.output.dir}/test-resources/jaxws/jbpapp3389/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -358,8 +370,8 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/"> <include name="wsse.*" /> </metainf> - </jar> - + </jar> + <!-- jaxws-jbws2116--> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2116.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -563,8 +575,8 @@ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2637/WEB-INF"> <include name="*" /> </webinf> - </war> - + </war> + <!-- jaxws-jbws2682 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2682.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2682/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -697,21 +709,21 @@ <include name="**/*.xsd" /> </webinf> </war> - + <!-- jaxws-jbws3071 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3071.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3071/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.class" /> <include name="org/jboss/test/ws/jaxws/jbws3071/TestException.class" /> </classes> - </war> + </war> <!-- jaxws-webserviceref --> <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class" /> </classes> - </war> + </war> <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.class" /> Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/Endpoint.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/Endpoint.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/Endpoint.java 2010-12-03 17:41:47 UTC (rev 13407) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.test.ws.jaxws.jbpapp2143; + +import javax.jws.WebService; + +/** + * Test Endpoint. + * + * @author darran.lofthouse(a)jboss.com + * @since 3rd December 2010 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbpapp2143") +public interface Endpoint +{ + + public String verifyNoContentLength(final String message); + + public String verifyHasContentLength(final String message); + +} Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/Endpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/EndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/EndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/EndpointImpl.java 2010-12-03 17:41:47 UTC (rev 13407) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.test.ws.jaxws.jbpapp2143; + +import java.util.Map; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; + +/** + * Test Endpoint implementation. + * + * @author darran.lofthouse(a)jboss.com + * @since 3rd December 2010 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbpapp2143", endpointInterface = "org.jboss.test.ws.jaxws.jbpapp2143.Endpoint") +public class EndpointImpl implements Endpoint +{ + + @Resource + private WebServiceContext context; + + public String verifyNoContentLength(final String message) + { + if (getContentLength() != null) + { + throw new IllegalArgumentException("Unexpected content length recieved."); + } + + return message; + } + + public String verifyHasContentLength(final String message) + { + if (getContentLength() == null) + { + throw new IllegalArgumentException("Expected content length not recieved."); + } + + return message; + } + + private Object getContentLength() + { + Map headers = (Map)context.getMessageContext().get(MessageContext.HTTP_REQUEST_HEADERS); + Object contentLength = headers.get("content-length"); + + return contentLength; + } + +} Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/EndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/JBPAPP2143TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/JBPAPP2143TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/JBPAPP2143TestCase.java 2010-12-03 17:41:47 UTC (rev 13407) @@ -0,0 +1,128 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.test.ws.jaxws.jbpapp2143; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ws.core.StubExt; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBPAPP-2143] Setting a new config at runtime the properties are not + * available to RemotingConnectionImpl + * + * @author darran.lofthouse(a)jboss.com + * @since 3rd December 2010 + * @see https://jira.jboss.org/browse/JBPAPP-2143 + */ +public class JBPAPP2143TestCase extends JBossWSTest +{ + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBPAPP2143TestCase.class, "jaxws-jbpapp2143.war"); + } + + // Default config, chunked so no content length. + public void testNoConfig_Success() throws Exception + { + Service service = getService(); + Endpoint port = service.getPort(Endpoint.class); + + String message = "Hello 1"; + String response = port.verifyNoContentLength(message); + assertEquals("Response Message", message, response); + } + + // Default config, chunked so no content length. + public void testNoConfig_Failure() throws Exception + { + Service service = getService(); + Endpoint port = service.getPort(Endpoint.class); + + String message = "Hello 2"; + try + { + port.verifyHasContentLength(message); + fail("Expected exception not thrown."); + } + catch (Exception ignored) + { + } + + } + + // Custom config, chunking disables so has content length. + public void testWithConfig_Success() throws Exception + { + Service service = getService(); + Endpoint port = service.getPort(Endpoint.class); + setConfigName(port); + + String message = "Hello 3"; + String response = port.verifyHasContentLength(message); + assertEquals("Response Message", message, response); + } + + // Custom config, chunking disables so has content length. + public void testWithConfig_Failure() throws Exception + { + Service service = getService(); + Endpoint port = service.getPort(Endpoint.class); + setConfigName(port); + + String message = "Hello 4"; + try + { + port.verifyNoContentLength(message); + fail("Expected exception not thrown."); + } + catch (Exception ignored) + { + } + + } + + void setConfigName(Endpoint port) + { + File config = getResourceFile("jaxws/jbpapp2143/META-INF/jbpapp2143-client-config.xml"); + ((StubExt)port).setConfigName("Test Config", config.getAbsolutePath()); + } + + Service getService() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbpapp2143?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbpapp2143";, "EndpointImplService"); + + Service service = Service.create(wsdlURL, serviceName); + + return service; + } + +} Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbpapp2143/JBPAPP2143TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/META-INF/jbpapp2143-client-config.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/META-INF/jbpapp2143-client-config.xml (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/META-INF/jbpapp2143-client-config.xml 2010-12-03 17:41:47 UTC (rev 13407) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config + xmlns="urn:jboss:jaxws-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Test Client</config-name> + <feature>http://org.jboss.ws/dispatch/validate</feature> + <property> + <property-name>http://org.jboss.ws/http#chunksize</property-name> + <property-value>-1</property-value> + </property> + </client-config> + +</jaxws-config> Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/META-INF/jbpapp2143-client-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/jboss-web.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/jboss-web.xml 2010-12-03 17:41:47 UTC (rev 13407) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbpapp2143</context-root> +</jboss-web> \ No newline at end of file Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/web.xml 2010-12-03 17:41:47 UTC (rev 13407) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbpapp2143.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbpapp2143/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF