[jbossws-commits] JBossWS SVN: r14644 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client and 12 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Jun 30 07:13:55 EDT 2011
Author: richard.opalka at jboss.com
Date: 2011-06-30 07:13:54 -0400 (Thu, 30 Jun 2011)
New Revision: 14644
Added:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/application.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/application.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/application.xml
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/application.xml
Removed:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-sar/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-sar/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-sar/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-sar/
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/jbws2074/usecase1/client/JBWS2074TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.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 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -607,35 +607,35 @@
<attribute name="Dependencies" value="org.jboss.logging"/>
</manifest>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws2074-usecase1.war" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1-sar/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1-ear/META-INF">
<include name="application.xml" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws2074-usecase2.jar" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2-sar/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2-ear/META-INF">
<include name="application.xml" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws2074-usecase3.war" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3-sar/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3-ear/META-INF">
<include name="application.xml" />
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.sar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.ear">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws2074-usecase4.jar" />
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4-sar/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4-ear/META-INF">
<include name="application.xml" />
</metainf>
</jar>
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
@@ -62,7 +62,7 @@
assertEquals(expStr.toString(), retStr);
}
- public void testUsecase1WithoutSar() throws Exception
+ public void testUsecase1WithoutEar() throws Exception
{
try
{
@@ -75,16 +75,16 @@
}
}
- public void testUsecase1WithSar() throws Exception
+ public void testUsecase1WithEar() throws Exception
{
try
{
- deploy("jaxws-jbws2074-usecase1.sar");
+ deploy("jaxws-jbws2074-usecase1.ear");
executeTest();
}
finally
{
- undeploy("jaxws-jbws2074-usecase1.sar");
+ undeploy("jaxws-jbws2074-usecase1.ear");
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
@@ -58,7 +58,7 @@
assertEquals(expStr.toString(), retStr);
}
- public void testUsecase2WithoutSar() throws Exception
+ public void testUsecase2WithoutEar() throws Exception
{
try
{
@@ -71,16 +71,16 @@
}
}
- public void testUsecase2WithSar() throws Exception
+ public void testUsecase2WithEar() throws Exception
{
try
{
- deploy("jaxws-jbws2074-usecase2.sar");
+ deploy("jaxws-jbws2074-usecase2.ear");
executeTest();
}
finally
{
- undeploy("jaxws-jbws2074-usecase2.sar");
+ undeploy("jaxws-jbws2074-usecase2.ear");
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
@@ -58,7 +58,7 @@
assertEquals(expStr.toString(), retStr);
}
- public void testUsecase3WithoutSar() throws Exception
+ public void testUsecase3WithoutEar() throws Exception
{
try
{
@@ -71,16 +71,16 @@
}
}
- public void testUsecase3WithSar() throws Exception
+ public void testUsecase3WithEar() throws Exception
{
try
{
- deploy("jaxws-jbws2074-usecase3.sar");
+ deploy("jaxws-jbws2074-usecase3.ear");
executeTest();
}
finally
{
- undeploy("jaxws-jbws2074-usecase3.sar");
+ undeploy("jaxws-jbws2074-usecase3.ear");
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2011-06-30 10:19:05 UTC (rev 14643)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2011-06-30 11:13:54 UTC (rev 14644)
@@ -63,7 +63,7 @@
assertEquals(expStr.toString(), retStr);
}
- public void testUsecase4WithoutSar() throws Exception
+ public void testUsecase4WithoutEar() throws Exception
{
try
{
@@ -76,16 +76,16 @@
}
}
- public void testUsecase4WithSar() throws Exception
+ public void testUsecase4WithEar() throws Exception
{
try
{
- deploy("jaxws-jbws2074-usecase4.sar");
+ deploy("jaxws-jbws2074-usecase4.ear");
executeTest();
}
finally
{
- undeploy("jaxws-jbws2074-usecase4.sar");
+ undeploy("jaxws-jbws2074-usecase4.ear");
}
}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/application.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/application.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase1-ear/META-INF/application.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <web>
+ <web-uri>jaxws-jbws2074-usecase1.war</web-uri>
+ <context-root>/jaxws-jbws2074-usecase1</context-root>
+ </web>
+ </module>
+</application>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/application.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/application.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase2-ear/META-INF/application.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <java>jaxws-jbws2074-usecase2.jar</java>
+ </module>
+</application>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/application.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/application.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase3-ear/META-INF/application.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <web>
+ <web-uri>jaxws-jbws2074-usecase3.war</web-uri>
+ <context-root>/jaxws-jbws2074-usecase3</context-root>
+ </web>
+ </module>
+</application>
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/application.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/application.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2074/usecase4-ear/META-INF/application.xml 2011-06-30 11:13:54 UTC (rev 14644)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ version="1.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <display-name>jbws2074 issue</display-name>
+ <module>
+ <java>jaxws-jbws2074-usecase4.jar</java>
+ </module>
+</application>
More information about the jbossws-commits
mailing list