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

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2011-06-30 07:26:29 -0400 (Thu, 30 Jun 2011)
New Revision: 14645

Removed:
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/
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/jbws1854/JBWS1854TestCase.java
Log:
[JBAS-9188] refactoring sar -> ear. Sars with nested archives are not supported on AS7

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-30 11:13:54 UTC (rev 14644)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml	2011-06-30 11:26:29 UTC (rev 14645)
@@ -501,13 +501,10 @@
 				<include name="jboss-web.xml" />
 			</webinf>
 		</war>
-		<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.sar">
+		<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.ear">
 			<fileset dir="${tests.output.dir}/test-libs">
 				<include name="jaxws-jbws1854.war" />
 			</fileset>
-			<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/META-INF">
-				<include name="jboss-service.xml" />
-			</metainf>
 		</jar>
 
 		<!-- jaxws-jbws1872 -->

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java	2011-06-30 11:13:54 UTC (rev 14644)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java	2011-06-30 11:26:29 UTC (rev 14645)
@@ -44,7 +44,7 @@
 {
    public static Test suite()
    {
-      return new JBossWSTestSetup(JBWS1854TestCase.class, "jaxws-jbws1854.sar");
+      return new JBossWSTestSetup(JBWS1854TestCase.class, "jaxws-jbws1854.ear");
    }
 
    public void testPortAccess() throws Exception