Author: richard.opalka(a)jboss.com
Date: 2011-06-30 07:35:09 -0400 (Thu, 30 Jun 2011)
New Revision: 14647
Added:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml
Removed:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml
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] rollback previous commit
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:34:06 UTC (rev 14646)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-06-30
11:35:09 UTC (rev 14647)
@@ -501,10 +501,13 @@
<include name="jboss-web.xml" />
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.ear">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.sar">
<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:34:06 UTC (rev 14646)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2011-06-30
11:35:09 UTC (rev 14647)
@@ -44,7 +44,7 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS1854TestCase.class,
"jaxws-jbws1854.ear");
+ return new JBossWSTestSetup(JBWS1854TestCase.class,
"jaxws-jbws1854.sar");
}
public void testPortAccess() throws Exception
Deleted:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml 2011-06-30
11:13:54 UTC (rev 14644)
+++
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml 2011-06-30
11:35:09 UTC (rev 14647)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:jboss:service:7.0"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
-</server>
Copied:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml
(from rev 14644,
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml)
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml
(rev 0)
+++
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1854/META-INF/jboss-service.xml 2011-06-30
11:35:09 UTC (rev 14647)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="urn:jboss:service:7.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
+</server>