Author: thomas.diesler(a)jboss.com Date: 2007-01-10 16:13:36 -0500 (Wed, 10 Jan 2007) New Revision: 1908 Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/ Removed: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/ Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml Log: partial commit Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 21:13:36 UTC (rev 1908) @@ -918,13 +918,13 @@ </metainf> </jar> - <!-- jaxrpc-jbws1339 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1339.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1339/WEB-INF/web.xml"> + <!-- jaxrpc-jbws1386 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1339/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1339/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1386/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1386/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1339/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> Copied: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386 (from rev 1907, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339) Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/JBWS1339TestCase.java 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1339TestCase.java 2007-01-10 21:13:36 UTC (rev 1908) @@ -19,7 +19,7 @@ * 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.jaxrpc.jbws1339; +package org.jboss.test.ws.jaxrpc.jbws1386; import java.io.File; import java.net.URL; @@ -42,13 +42,13 @@ * @author Thomas.Diesler(a)jboss.com * @since 09-Jan-2007 */ -public class JBWS1339TestCase extends JBossWSTest +public class JBWS1386TestCase extends JBossWSTest { private static RequestService port; public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1339TestCase.class, "jaxrpc-jbws1339.war"); + return JBossWSTestSetup.newTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war"); } protected void setUp() throws Exception @@ -57,12 +57,12 @@ if (port == null) { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName serviceName = new QName("http://org.jboss.test.ws/jbws1339", "TestService"); + URL wsdlURL = new File("resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName("http://org.jboss.test.ws/jbws1386", "TestService"); Service service = factory.createService(wsdlURL, serviceName , mappingURL); port = (RequestService)service.getPort(RequestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1339"); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1386"); } } Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/Message.java 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/Message.java 2007-01-10 21:13:36 UTC (rev 1908) @@ -19,7 +19,7 @@ * 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.jaxrpc.jbws1339; +package org.jboss.test.ws.jaxrpc.jbws1386; public class Message { Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestService.java 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestService.java 2007-01-10 21:13:36 UTC (rev 1908) @@ -19,7 +19,7 @@ * 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.jaxrpc.jbws1339; +package org.jboss.test.ws.jaxrpc.jbws1386; import java.rmi.Remote; import java.rmi.RemoteException; Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1339/RequestServiceBean.java 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1386/RequestServiceBean.java 2007-01-10 21:13:36 UTC (rev 1908) @@ -19,7 +19,7 @@ * 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.jaxrpc.jbws1339; +package org.jboss.test.ws.jaxrpc.jbws1386; import java.rmi.RemoteException; @@ -49,7 +49,7 @@ { SOAPMessageContext msgCtx = (SOAPMessageContext)sepCtx.getMessageContext(); SOAPBody body = msgCtx.getMessage().getSOAPBody(); - QName rpcOpName = new QName("http://org.jboss.test.ws/jbws1339", "processClaim"); + QName rpcOpName = new QName("http://org.jboss.test.ws/jbws1386", "processClaim"); SOAPElement bodyEl = (SOAPElement)body.getChildElements(rpcOpName).next(); SOAPElement soapEl = (SOAPElement)bodyEl.getChildElements(new QName("Message_1")).next(); soapEl = (SOAPElement)soapEl.getChildElements(new QName("data")).next(); Copied: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386 (from rev 1907, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339) Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/jaxrpc-mapping.xml 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml 2007-01-10 21:13:36 UTC (rev 1908) @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1339</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1339/types</namespaceURI> + <package-type>org.jboss.test.ws.jaxrpc.jbws1386</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1386/types</namespaceURI> </package-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1339.Message</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1339/types'>typeNS:Message</root-type-qname> + <java-type>org.jboss.test.ws.jaxrpc.jbws1386.Message</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1386/types'>typeNS:Message</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>data</java-variable-name> @@ -17,32 +17,32 @@ </variable-mapping> </java-xml-type-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1339.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1339'>serviceNS:TestService</wsdl-service-name> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1386.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1386'>serviceNS:TestService</wsdl-service-name> <port-mapping> <port-name>RequestServicePort</port-name> <java-port-name>RequestServicePort</java-port-name> </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1339.RequestService</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1339'>portTypeNS:RequestService</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1339'>bindingNS:RequestServiceBinding</wsdl-binding> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1386.RequestService</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1386'>portTypeNS:RequestService</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1386'>bindingNS:RequestServiceBinding</wsdl-binding> <service-endpoint-method-mapping> <java-method-name>processClaim</java-method-name> <wsdl-operation>processClaim</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.jbws1339.Message</param-type> + <param-type>org.jboss.test.ws.jaxrpc.jbws1386.Message</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1339'>wsdlMsgNS:RequestService_processClaim</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1386'>wsdlMsgNS:RequestService_processClaim</wsdl-message> <wsdl-message-part-name>Message_1</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.jbws1339.Message</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1339'>wsdlMsgNS:RequestService_processClaimResponse</wsdl-message> + <method-return-value>org.jboss.test.ws.jaxrpc.jbws1386.Message</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1386'>wsdlMsgNS:RequestService_processClaimResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/web.xml 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/web.xml 2007-01-10 21:13:36 UTC (rev 1908) @@ -5,7 +5,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1339.RequestServiceBean</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1386.RequestServiceBean</servlet-class> </servlet> <servlet-mapping> Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/webservices.xml 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/webservices.xml 2007-01-10 21:13:36 UTC (rev 1908) @@ -1 +1 @@ -<webservices 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://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd' version='1.1'><webservice-description><webservice-description-name>TestService</webservice-description-name><wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file><jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file><port-component><port-component-name>RequestServicePort</port-component-name><wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1339'>portNS:RequestServicePort</wsdl-port><service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1339.RequestService</service-endpoint-interface><service-impl-bean><servlet-link>TestEndpoint</servlet-link></service-impl-bean></port-component></webservice-description></webservices> \ No newline at end of file +<webservices 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://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd' version='1.1'><webservice-description><webservice-description-name>TestService</webservice-description-name><wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file><jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file><port-component><port-component-name>RequestServicePort</port-component-name><wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1386'>portNS:RequestServicePort</wsdl-port><service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1386.RequestService</service-endpoint-interface><service-impl-bean><servlet-link>TestEndpoint</servlet-link></service-impl-bean></port-component></webservice-description></webservices> \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/WEB-INF/wsdl/TestService.wsdl 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl 2007-01-10 21:13:36 UTC (rev 1908) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1339' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1339/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1339' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1386' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1386/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1386' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws1339/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1339/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <schema targetNamespace='http://org.jboss.test.ws/jbws1386/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1386/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> <import namespace='http://www.w3.org/2001/XMLSchema'/> <complexType name='Message'> <sequence> @@ -28,10 +28,10 @@ <operation name='processClaim'> <soap:operation soapAction=''/> <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1339' use='literal'/> + <soap:body namespace='http://org.jboss.test.ws/jbws1386' use='literal'/> </input> <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1339' use='literal'/> + <soap:body namespace='http://org.jboss.test.ws/jbws1386' use='literal'/> </output> </operation> </binding> Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1339/test-config.xml 2007-01-10 20:55:45 UTC (rev 1907) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1386/test-config.xml 2007-01-10 21:13:36 UTC (rev 1908) @@ -7,9 +7,9 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1339.RequestService" style="rpc"> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1386.RequestService" style="rpc"> </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1339" type-namespace="http://org.jboss.test.ws/jbws1339/types"/> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1386" type-namespace="http://org.jboss.test.ws/jbws1386/types"/> <mapping file="jaxrpc-mapping.xml"/> <webservices servlet-link="TestEndpoint"/> </java-wsdl>