Author: alessio.soldano(a)jboss.com Date: 2011-07-26 10:05:06 -0400 (Tue, 26 Jul 2011) New Revision: 14748 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java Log: Fixing regressions due to JBWS-3310 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-07-26 11:16:01 UTC (rev 14747) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-07-26 14:05:06 UTC (rev 14748) @@ -795,7 +795,7 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient" /> </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-override-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-override-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class" /> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class" /> @@ -810,7 +810,7 @@ <include name="wsdl/**" /> </metainf> <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo" /> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo" /> </manifest> </jar> @@ -820,7 +820,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class" /> </fileset> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-secure-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-secure-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class" /> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class" /> @@ -834,22 +834,6 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient" /> </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class" /> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class" /> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml" /> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> - <include name="wsdl/**" /> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo" /> - </manifest> - </jar> <!-- jaxws-wsdd --> <war warfile="${tests.output.dir}/test-libs/jaxws-wsdd.war" webxml="${tests.output.dir}/test-resources/jaxws/wsdd/WEB-INF/web.xml"> @@ -878,7 +862,7 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial-cl.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class" /> @@ -899,7 +883,7 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto-cl.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class" /> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2011-07-26 11:16:01 UTC (rev 14747) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2011-07-26 14:05:06 UTC (rev 14748) @@ -43,7 +43,7 @@ public static Test suite() { - return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-override-client.jar"); + return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-webserviceref.war, jaxws-override-webserviceref-client.jar"); } public void testService1() throws Throwable Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2011-07-26 11:16:01 UTC (rev 14747) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2011-07-26 14:05:06 UTC (rev 14748) @@ -48,7 +48,7 @@ public static Test suite() { - return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-webserviceref-secure.jar, jaxws-webserviceref-secure-client.jar"); + return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-webserviceref-secure.jar, jaxws-secure-webserviceref-client.jar"); } public void testWSDLAccess() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2011-07-26 11:16:01 UTC (rev 14747) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2011-07-26 14:05:06 UTC (rev 14748) @@ -53,8 +53,8 @@ public static Test suite() { return new JBossWSTestSetup(AddressingReplyToTestCase.class, - "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-client.jar," + - "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-client.jar," + + "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-cl.jar," + + "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-cl.jar," + "jaxws-wsaddressing-faultto.war"); }