[jbossws-commits] JBossWS SVN: r3554 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/interop/wsa and 2 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-06-12 09:17:18 -0400 (Tue, 12 Jun 2007) New Revision: 3554 Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java trunk/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt Log: Add wsa10 endpoints Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 12:51:03 UTC (rev 3553) +++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-12 13:17:18 UTC (rev 3554) @@ -451,7 +451,7 @@ </fileset> </war> - <!-- BaseDataTypesDocLitB.war --> + <!-- jbossws-interop-BaseDataTypesDocLitB.war --> <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war" webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -468,7 +468,7 @@ </fileset> </war> - <!-- BaseDataTypesDocLitW.war --> + <!-- jbossws-interop-BaseDataTypesDocLitW.war --> <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war" webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -485,7 +485,7 @@ </fileset> </war> - <!-- BaseDataTypesRpcLit.war --> + <!-- jbossws-interop-BaseDataTypesRpcLit.war --> <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war" webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -502,6 +502,23 @@ </fileset> </war> + <!-- jbossws-interop-wsa10.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10.war" + webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/wsa/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF"> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${tests.output.dir}/resources/interop/wsa"> + <include name="*.*"/> + </fileset> + </war> + </target> </project> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-06-12 12:51:03 UTC (rev 3553) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-06-12 13:17:18 UTC (rev 3554) @@ -60,8 +60,8 @@ static { - org.jboss.test.ws.interop.wsa.AddressingTestCase.BUILDER = AddressingBuilder.getAddressingBuilder(); - org.jboss.test.ws.interop.wsa.AddressingTestCase.CONSTANTS = org.jboss.test.ws.interop.wsa.AddressingTestCase.BUILDER.newAddressingConstants(); + AddressingTestCase.BUILDER = AddressingBuilder.getAddressingBuilder(); + AddressingTestCase.CONSTANTS = AddressingTestCase.BUILDER.newAddressingConstants(); } private Element customerParam; @@ -72,7 +72,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10-service.war"); + return JBossWSTestSetup.newTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10.war"); } protected void setUp() throws Exception @@ -89,9 +89,16 @@ ((StubExt)echoPort).setConfigName("Standard WSAddressing Client"); ((StubExt)notifyPort).setConfigName("Standard WSAddressing Client"); - ((BindingProvider)echoPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/echo"); - ((BindingProvider)notifyPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/notify"); + ((BindingProvider)echoPort).getRequestContext().put( + BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + "http://"+getServerHost()+":8080/wsa10/echo" + ); + ((BindingProvider)notifyPort).getRequestContext().put( + BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + "http://"+getServerHost()+":8080/wsa10/notify" + ); + configureClient(); } @@ -106,11 +113,11 @@ private void configureClient() { ((BindingProvider)echoPort).getRequestContext().put( - BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://jbossws.demo.jboss.com:8080/wsa10/echo" + BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/echo" ); ((BindingProvider)notifyPort).getRequestContext().put( - BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://jbossws.demo.jboss.com:8080/wsa10/notify" + BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/notify" ); /* Modified: trunk/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl =================================================================== --- trunk/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl 2007-06-12 12:51:03 UTC (rev 3553) +++ trunk/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl 2007-06-12 13:17:18 UTC (rev 3554) @@ -1,70 +1,9 @@ <wsdl:definitions targetNamespace='http://example.org/' xmlns:i0='http://example.org/notify' xmlns:i1='http://example.org/echo' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://example.org/' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/08/addressing/policy' xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-ws... xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <wsp:Policy wsu:Id='CustomBinding_Notify_policy'> - <wsp:ExactlyOne> - <wsp:All> - <wsaw:UsingAddressing/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - <wsp:Policy wsu:Id='CustomBinding_Notify1_policy'> - <wsp:ExactlyOne> - <wsp:All> - <wsaw:UsingAddressing/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - <wsp:Policy wsu:Id='CustomBinding_Echo_policy'> - <wsp:ExactlyOne> - <wsp:All> - <wsaw:UsingAddressing/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - <wsp:Policy wsu:Id='CustomBinding_Echo1_policy'> - <wsp:ExactlyOne> - <wsp:All> - <wsaw:UsingAddressing/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - <wsp:Policy wsu:Id='CustomBinding_Echo2_policy'> - <wsp:ExactlyOne> - <wsp:All> - <wsaw:UsingAddressing/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - <wsp:Policy wsu:Id='CustomBinding_Echo3_policy'> - <wsp:ExactlyOne> - <wsp:All> - <wsaw:UsingAddressing/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - <wsp:Policy wsu:Id='CustomBinding_Echo4_policy'> - <wsp:ExactlyOne> - <wsp:All> - <cdp:CompositeDuplex xmlns:cdp='http://schemas.microsoft.com/net/2006/06/duplex'/> - <ow:OneWay xmlns:ow='http://schemas.microsoft.com/ws/2005/05/routing/policy'... - <wsaw:UsingAddressing/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - <wsp:Policy wsu:Id='CustomBinding_Echo5_policy'> - <wsp:ExactlyOne> - <wsp:All> - <cdp:CompositeDuplex xmlns:cdp='http://schemas.microsoft.com/net/2006/06/duplex'/> - <ow:OneWay xmlns:ow='http://schemas.microsoft.com/ws/2005/05/routing/policy'... - <wsaw:UsingAddressing/> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> <wsdl:import location='wsdl0.wsdl' namespace='http://example.org/notify'/> <wsdl:import location='wsdl2.wsdl' namespace='http://example.org/echo'/> <wsdl:types/> - <wsdl:binding name='CustomBinding_Notify' type='i0:Notify'> - <wsp:PolicyReference URI='#CustomBinding_Notify_policy'/> + <wsdl:binding name='CustomBinding_Notify' type='i0:Notify'> <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> <wsdl:operation name='Notify'> <soap:operation soapAction='http://example.org/action/notify' style='document'/> @@ -84,7 +23,6 @@ </wsdl:operation> </wsdl:binding--> <wsdl:binding name='CustomBinding_Echo' type='i1:EchoPortType'> - <wsp:PolicyReference URI='#CustomBinding_Echo_policy'/> <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> <wsdl:operation name='EchoOp'> <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> @@ -110,7 +48,6 @@ </wsdl:operation> </wsdl:binding--> <wsdl:binding name='CustomBinding_Echo2' type='i1:EchoPortType'> - <wsp:PolicyReference URI='#CustomBinding_Echo2_policy'/> <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> <wsdl:operation name='EchoOp'> <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> @@ -136,7 +73,6 @@ </wsdl:operation> </wsdl:binding--> <wsdl:binding name='CustomBinding_Echo4' type='i1:EchoPortType'> - <wsp:PolicyReference URI='#CustomBinding_Echo4_policy'/> <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> <wsdl:operation name='EchoOp'> <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> Modified: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt =================================================================== --- trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-06-12 12:51:03 UTC (rev 3553) +++ trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-06-12 13:17:18 UTC (rev 3554) @@ -1,5 +1,5 @@ # Always exclude -org/jboss/test/ws/interop/** +#org/jboss/test/ws/interop/** org/jboss/test/ws/benchmark/** # EJB3/Injection excludes