[jbossws-commits] JBossWS SVN: r14642 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws1581 and 1 other directory.

Author: richard.opalka(a)jboss.com Date: 2011-06-29 10:38:53 -0400 (Wed, 29 Jun 2011) New Revision: 14642 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/jbws1581/JBWS1581EarTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java Log: do not bundle jboss-web.xml for AS7 runtime - it contains class-loading element that AS7 doesn't recognize 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-06-29 14:37:40 UTC (rev 14641) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-29 14:38:53 UTC (rev 14642) @@ -16,7 +16,7 @@ <target name="build-jars-jaxws" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/test-libs" /> + <mkdir dir="${tests.output.dir}/test-libs/as6" /> <!-- jaxws-anonymous --> <war warfile="${tests.output.dir}/test-libs/jaxws-anonymous.war" webxml="${tests.output.dir}/test-resources/jaxws/anonymous/WEB-INF/web.xml"> @@ -254,7 +254,7 @@ </jar> <!-- jaxws-jbws1581 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" /> @@ -263,6 +263,20 @@ <include name="jboss-web.xml" /> </webinf> </war> + <jar jarfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581.ear"> + <fileset dir="${tests.output.dir}/test-libs/as6"> + <include name="jaxws-jbws1581-pojo.war" /> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> + <include name="jboss-app.xml" /> + </metainf> + </jar> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" /> + </classes> + </war> <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.ear"> <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-jbws1581-pojo.war" /> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-06-29 14:37:40 UTC (rev 14641) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-06-29 14:38:53 UTC (rev 14642) @@ -43,7 +43,10 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"); + String archives = isTargetJBoss6() + ? "as6/jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar" + : "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"; + return new JBossWSTestSetup(JBWS1581EarTestCase.class, archives); } public void testWSDLAccess() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-06-29 14:37:40 UTC (rev 14641) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-06-29 14:38:53 UTC (rev 14642) @@ -43,7 +43,10 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"); + String archives = isTargetJBoss6() + ? "as6/jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar" + : "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"; + return new JBossWSTestSetup(JBWS1581WarTestCase.class, archives); } public void testWSDLAccess() throws Exception