Author: richard.opalka(a)jboss.com Date: 2009-05-29 09:21:21 -0400 (Fri, 29 May 2009) New Revision: 10145 Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/cxf.xml Removed: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java Log: [JBWS-2661] fixing samples/tests (except wstrust) Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-05-29 13:21:21 UTC (rev 10145) @@ -7,9 +7,9 @@ <!-- ============================================================ --> <project> - + <description>JBossWS test archive builder</description> - + <!-- ============================================================================== --> <!-- Building --> <!-- --> @@ -17,11 +17,11 @@ <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#... --> <!-- --> <!-- ============================================================================== --> - + <target name="build-jars-jaxws" description="Build the deployments."> - + <mkdir dir="${tests.output.dir}/test-libs"/> - + <!-- jaxws-cxf-descriptor --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -31,14 +31,14 @@ <include name="jbossws-cxf.xml"/> </webinf> </war> - + <!-- jaxws-cxf-interop-wstrust10-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> <include name="**/*" /> </metainf> </jar> - + <!-- jaxws-cxf-wsrm-basic-doc --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -49,7 +49,7 @@ <include name="jbossws-cxf.xml"/> </webinf> </war> - + <!-- jaxws-cxf-wsrm-basic-rpc --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -60,9 +60,16 @@ <include name="jbossws-cxf.xml"/> </webinf> </war> - + + <!-- jaxws-cxf-wsrm-basic-client --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/"> + <include name="cxf.xml" /> + </metainf> + </jar> + <!-- Please add alphabetically --> - + </target> - + </project> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2009-05-29 13:21:21 UTC (rev 10145) @@ -7,15 +7,15 @@ <!-- ============================================================ --> <project> - + <!-- ================================================================== --> <!-- Building --> <!-- ================================================================== --> - + <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - + <mkdir dir="${tests.output.dir}/test-libs"/> - + <!-- jaxws-samples-wsa --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" @@ -32,6 +32,12 @@ prefix="WEB-INF/wsdl"/> </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsa-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa"> + <include name="cxf.xml"/> + </metainf> + </jar> + <!-- jaxws-samples-wsrm --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" @@ -46,8 +52,13 @@ dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> - - + + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm"> + <include name="cxf.xml"/> + </metainf> + </jar> + <!-- jaxws-samples-wsse-sign --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war" @@ -55,26 +66,26 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> <include name="jbossws-cxf.xml"/> - <include name="wsdl/*"/> + <include name="wsdl/*"/> </webinf> <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF" prefix="WEB-INF/classes"> <include name="bob.jks" /> <include name="bob.properties" /> </zipfileset> </war> - + <!-- jaxws-samples-wsse-sign-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> <include name="alice.properties" /> - <include name="alice.jks" /> + <include name="alice.jks" /> </metainf> </jar> - + <!-- jaxws-samples-wsse-sign-encrypt --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war" @@ -82,26 +93,26 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> <include name="jbossws-cxf.xml"/> - <include name="wsdl/*"/> + <include name="wsdl/*"/> </webinf> <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF" prefix="WEB-INF/classes"> <include name="bob.jks" /> <include name="bob.properties" /> </zipfileset> </war> - + <!-- jaxws-samples-wsse-sign-encrypt-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> <include name="alice.properties" /> - <include name="alice.jks" /> + <include name="alice.jks" /> </metainf> </jar> - + <!-- jaxws-samples-wsse-username --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war" @@ -109,14 +120,14 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF"> <include name="jbossws-cxf.xml"/> - <include name="wsdl/*"/> + <include name="wsdl/*"/> </webinf> </war> - + <!-- jaxws-samples-wssePolicy-sign --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign.war" @@ -124,26 +135,26 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/> <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF"> <include name="jbossws-cxf.xml"/> - <include name="wsdl/*"/> + <include name="wsdl/*"/> </webinf> <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/WEB-INF" prefix="WEB-INF/classes"> <include name="bob.jks" /> <include name="bob.properties" /> </zipfileset> </war> - + <!-- jaxws-samples-wssePolicy-sign-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign/META-INF"> <include name="alice.properties" /> - <include name="alice.jks" /> + <include name="alice.jks" /> </metainf> </jar> - + <!-- jaxws-samples-wssePolicy-sign-encrypt --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-encrypt.war" @@ -151,26 +162,26 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/> <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF"> <include name="jbossws-cxf.xml"/> - <include name="wsdl/*"/> + <include name="wsdl/*"/> </webinf> <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF" prefix="WEB-INF/classes"> <include name="bob.jks" /> <include name="bob.properties" /> </zipfileset> </war> - + <!-- jaxws-samples-wssePolicy-sign-encrypt-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign-encrypt-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/sign-encrypt/META-INF"> <include name="alice.properties" /> - <include name="alice.jks" /> + <include name="alice.jks" /> </metainf> </jar> - + <!-- jaxws-samples-wssePolicy-username --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-username.war" @@ -178,16 +189,16 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/Service*.class"/> <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/jaxws/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssePolicy/username/WEB-INF"> <include name="jbossws-cxf.xml"/> - <include name="wsdl/*"/> + <include name="wsdl/*"/> </webinf> </war> <!-- Please add alphabetically --> - + </target> - + </project> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2009-05-29 13:21:21 UTC (rev 10145) @@ -29,9 +29,6 @@ import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -50,7 +47,7 @@ public static Test suite() { - return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war"); + return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war,jaxws-cxf-wsrm-basic-client.jar"); } public void testWSDLAccess() throws Exception @@ -62,7 +59,7 @@ System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies"); } - public void _testStandardClient() throws Exception + public void testClient() throws Exception { URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl"); QName serviceName = new QName(targetNS, "RMService"); @@ -70,37 +67,11 @@ Service service = Service.create(wsdlURL, serviceName); BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class); - System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only"); + // Enable addressing + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); - //Object retObj = port.echo("Hello"); - //assertEquals("Hello", retObj); + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); } - - public void testSpringClient() throws Exception - { - SpringBusFactory bf = new SpringBusFactory(); - URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml"); - Bus bus = bf.createBus(cxfConfig); - try - { - BusFactory.setDefaultBus(bus); - - URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl"); - QName serviceName = new QName(targetNS, "RMService"); - - Service service = Service.create(wsdlURL, serviceName); - BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class); - - // Enable addressing - BindingProvider bp = (BindingProvider)port; - bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); - - Object retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } - finally - { - bus.shutdown(true); - } - } } Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2009-05-29 13:21:21 UTC (rev 10145) @@ -29,9 +29,6 @@ import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -50,7 +47,7 @@ public static Test suite() { - return new JBossWSTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.war"); + return new JBossWSTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.war,jaxws-cxf-wsrm-basic-client.jar"); } public void testWSDLAccess() throws Exception @@ -62,7 +59,7 @@ System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies"); } - public void _testStandardClient() throws Exception + public void testClient() throws Exception { URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl"); QName serviceName = new QName(targetNS, "RMService"); @@ -70,37 +67,11 @@ Service service = Service.create(wsdlURL, serviceName); BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class); - System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only"); + // Enable addressing + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); Object retObj = port.echo("Hello"); assertEquals("Hello", retObj); } - - public void testSpringClient() throws Exception - { - SpringBusFactory bf = new SpringBusFactory(); - URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml"); - Bus bus = bf.createBus(cxfConfig); - try - { - BusFactory.setDefaultBus(bus); - - URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl"); - QName serviceName = new QName(targetNS, "RMService"); - - Service service = Service.create(wsdlURL, serviceName); - BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class); - - // Enable addressing - BindingProvider bp = (BindingProvider)port; - bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); - - Object retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } - finally - { - bus.shutdown(true); - } - } } Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2009-05-29 13:21:21 UTC (rev 10145) @@ -21,13 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.wsa; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.Service; + import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -40,11 +38,10 @@ { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService"; private ServiceIface proxy; - private Bus bus; public static Test suite() { - return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war"); + return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war,jaxws-samples-wsa-client.jar"); } @Override @@ -52,25 +49,12 @@ { super.setUp(); - SpringBusFactory busFactory = new SpringBusFactory(); - URL cxfConfig = new File("test-resources/jaxws/samples/wsa/cxf-client-config.xml").toURL(); - bus = busFactory.createBus(cxfConfig); - busFactory.setDefaultBus(bus); - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing";, "AddressingService"); URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); proxy = (ServiceIface)service.getPort(ServiceIface.class); } - @Override - protected void tearDown() throws Exception - { - bus.shutdown(true); - - super.tearDown(); - } - public void test() throws Exception { assertEquals("Hello World!", proxy.sayHello()); Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2009-05-29 13:21:21 UTC (rev 10145) @@ -21,14 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.wsrm.client; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.Service; + import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; @@ -42,11 +39,10 @@ { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService"; private SimpleService proxy; - private Bus bus; public static Test suite() { - return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war"); + return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war,jaxws-samples-wsrm-client.jar"); } @Override @@ -54,25 +50,12 @@ { super.setUp(); - SpringBusFactory busFactory = new SpringBusFactory(); - URL cxfConfig = getResourceURL("jaxws/samples/wsrm/wsrm-client-config.xml"); - bus = busFactory.createBus(cxfConfig); - busFactory.setDefaultBus(bus); - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleService"); URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); proxy = (SimpleService)service.getPort(SimpleService.class); } - @Override - protected void tearDown() throws Exception - { - bus.shutdown(true); - - super.tearDown(); - } - public void test() throws Exception { proxy.ping(); // one way call Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/cxf.xml 2009-05-29 13:21:21 UTC (rev 10145) @@ -0,0 +1,51 @@ +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:p="http://cxf.apache.org/policy" xmlns:cxf="http://cxf.apache.org/core" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + + <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/> + <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/> + <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/> + + <!--p:engine enabled="true" ignoreUnknownAssertions="true"/--> + + <cxf:bus name="cxf"> + <!--cxf:features> + <p:policies ignoreUnknownAssertions="true"/> + </cxf:features--> + <cxf:inInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalIn"/> + <ref bean="rmCodec"/> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalIn"/> + <ref bean="rmCodec"/> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalOut"/> + <ref bean="rmCodec"/> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalOut"/> + <ref bean="rmCodec"/> + </cxf:outFaultInterceptors> + </cxf:bus> + +</beans> \ No newline at end of file Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145) @@ -1,51 +0,0 @@ -<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" - xmlns:p="http://cxf.apache.org/policy" xmlns:cxf="http://cxf.apache.org/core" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> - - <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/> - <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/> - <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor"> - <property name="bus" ref="cxf"/> - </bean> - <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor"> - <property name="bus" ref="cxf"/> - </bean> - <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/> - - <!--p:engine enabled="true" ignoreUnknownAssertions="true"/--> - - <cxf:bus name="cxf"> - <!--cxf:features> - <p:policies ignoreUnknownAssertions="true"/> - </cxf:features--> - <cxf:inInterceptors> - <ref bean="mapAggregator"/> - <ref bean="mapCodec"/> - <ref bean="rmLogicalIn"/> - <ref bean="rmCodec"/> - </cxf:inInterceptors> - <cxf:inFaultInterceptors> - <ref bean="mapAggregator"/> - <ref bean="mapCodec"/> - <ref bean="rmLogicalIn"/> - <ref bean="rmCodec"/> - </cxf:inFaultInterceptors> - <cxf:outInterceptors> - <ref bean="mapAggregator"/> - <ref bean="mapCodec"/> - <ref bean="rmLogicalOut"/> - <ref bean="rmCodec"/> - </cxf:outInterceptors> - <cxf:outFaultInterceptors> - <ref bean="mapAggregator"/> - <ref bean="mapCodec"/> - <ref bean="rmLogicalOut"/> - <ref bean="rmCodec"/> - </cxf:outFaultInterceptors> - </cxf:bus> - -</beans> \ No newline at end of file Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145) @@ -1,18 +0,0 @@ -<beans - xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:wsa="http://cxf.apache.org/ws/addressing" - xsi:schemaLocation=" - http://cxf.apache.org/core - http://cxf.apache.org/schemas/core.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <cxf:bus> - <cxf:features> - <wsa:addressing/> - </cxf:features> - </cxf:bus> - -</beans> Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf.xml 2009-05-29 13:21:21 UTC (rev 10145) @@ -0,0 +1,18 @@ +<beans + xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xsi:schemaLocation=" + http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <cxf:bus> + <cxf:features> + <wsa:addressing/> + </cxf:features> + </cxf:bus> + +</beans> Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/cxf.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/cxf.xml 2009-05-29 13:21:21 UTC (rev 10145) @@ -0,0 +1,37 @@ +<beans + xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy&q... + xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" + xsi:schemaLocation=" + http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/transports/http/configuration + http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://schemas.xmlsoap.org/ws/2005/02/rm/policy + http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd + http://cxf.apache.org/ws/rm/manager + http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <cxf:bus> + <cxf:features> + <cxf:logging/> + <wsa:addressing/> + <wsrm-mgr:reliableMessaging> + <wsrm-policy:RMAssertion> + <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/> + <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/> + </wsrm-policy:RMAssertion> + <wsrm-mgr:destinationPolicy> + <wsrm-mgr:acksPolicy intraMessageThreshold="0" /> + </wsrm-mgr:destinationPolicy> + </wsrm-mgr:reliableMessaging> + </cxf:features> + </cxf:bus> + +</beans> Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml 2009-05-29 11:24:49 UTC (rev 10144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml 2009-05-29 13:21:21 UTC (rev 10145) @@ -1,37 +0,0 @@ -<beans - xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:wsa="http://cxf.apache.org/ws/addressing" - xmlns:http="http://cxf.apache.org/transports/http/configuration" - xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy&q... - xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" - xsi:schemaLocation=" - http://cxf.apache.org/core - http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/transports/http/configuration - http://cxf.apache.org/schemas/configuration/http-conf.xsd - http://schemas.xmlsoap.org/ws/2005/02/rm/policy - http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd - http://cxf.apache.org/ws/rm/manager - http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <cxf:bus> - <cxf:features> - <cxf:logging/> - <wsa:addressing/> - <wsrm-mgr:reliableMessaging> - <wsrm-policy:RMAssertion> - <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/> - <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/> - </wsrm-policy:RMAssertion> - <wsrm-mgr:destinationPolicy> - <wsrm-mgr:acksPolicy intraMessageThreshold="0" /> - </wsrm-mgr:destinationPolicy> - </wsrm-mgr:reliableMessaging> - </cxf:features> - </cxf:bus> - -</beans>