Author: richard.opalka(a)jboss.com Date: 2011-09-13 05:15:00 -0400 (Tue, 13 Sep 2011) New Revision: 15005 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java Log: [JBWS-2634] improve the test case - move all the common staff to shared.jar Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-09-13 06:15:56 UTC (rev 15004) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-09-13 09:15:00 UTC (rev 15005) @@ -852,16 +852,15 @@ <!-- jaxws-jbws2634 --> <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2634.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/shared/*.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2634/shared/**/*.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" /> </fileset> </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2634-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2634/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/*.class" /> </classes> <manifest> <attribute name="Dependencies" value="org.jboss.logging"/> @@ -869,11 +868,8 @@ </war> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/*.class" /> </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF"> <include name="ejb-jar.xml" /> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java 2011-09-13 06:15:56 UTC (rev 15004) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java 2011-09-13 09:15:00 UTC (rev 15005) @@ -51,11 +51,6 @@ @EJB private BeanIface bean1; - public TestHandler() - { - System.out.println(TestHandler.class + " constructor"); - } - /** * Indicates whether handler is in correct state. */ Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java 2011-09-13 06:15:56 UTC (rev 15004) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java 2011-09-13 09:15:00 UTC (rev 15005) @@ -49,11 +49,6 @@ public class EJB3Bean extends AbstractEndpointImpl { - public EJB3Bean() - { - System.out.println(EJB3Bean.class + " constructor"); - } - public String echo(String msg) { return super.echo(msg) + ":EJB3Bean"; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java 2011-09-13 06:15:56 UTC (rev 15004) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java 2011-09-13 09:15:00 UTC (rev 15005) @@ -40,11 +40,6 @@ public class POJOBean extends AbstractEndpointImpl { - public POJOBean() - { - System.out.println(POJOBean.class + " constructor"); - } - public String echo(String msg) { return super.echo(msg) + ":POJOBean";