[jboss-svn-commits] JBL Code SVN: r37063 - in labs/jbosstm/trunk/XTS: WS-C/tests/dd and 19 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 3 02:40:38 EDT 2011
Author: adinn
Date: 2011-06-03 02:40:37 -0400 (Fri, 03 Jun 2011)
New Revision: 37063
Added:
labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/manifest.mf
labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/war.manifest.mf
labs/jbosstm/trunk/XTS/WSAS/tests/dd/war.manifest.mf
labs/jbosstm/trunk/XTS/WSCF/tests/dd/manifest.mf
labs/jbosstm/trunk/XTS/WSCF/tests/dd/war.manifest.mf
labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/manifest.mf
labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/war.manifest.mf
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/manifest.mf
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/manifest.mf
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/dd/manifest.mf
labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml
labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/manifest.mf
labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/war.manifest.mf
labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_web-app.xml
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestSuite.java
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WS-T/dev/dd/manifest.mf
labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml
labs/jbosstm/trunk/XTS/WSAS/build.xml
labs/jbosstm/trunk/XTS/WSAS/tests/dd/manifest.mf
labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_application.xml
labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_web-app.xml
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_application.xml
labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_web-app.xml
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_application.xml
labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_web-app.xml
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml
labs/jbosstm/trunk/XTS/sar/META-INF/module.xml
Log:
modified unit tests and interop tests so they run on AS7 - fixes for JBTM-848
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/manifest.mf 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -1 +1,2 @@
-Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
+
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c11_web-app.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -20,8 +20,6 @@
@author JBoss Inc.
-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/manifest.mf 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -1 +1 @@
-Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/war.manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/war.manifest.mf 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/war.manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -1 +1 @@
-Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_web-app.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_web-app.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -20,9 +20,12 @@
@author JBoss Inc.
-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
-<web-app>
<display-name>Arjuna Web Services Coordination Tests</display-name>
<description>Arjuna Web Services Coordination Tests</description>
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestSuite.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestSuite.java 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/junit/TestSuite.java 2011-06-03 06:40:37 UTC (rev 37063)
@@ -31,7 +31,6 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
- /*
com.arjuna.wsc11.tests.junit.ActivationTestCase.class,
com.arjuna.wsc11.tests.junit.RegistrationTestCase.class,
com.arjuna.wsc11.tests.junit.ActivationServiceTestCase.class,
@@ -39,8 +38,6 @@
com.arjuna.wsc11.tests.junit.RegistrationServiceTestCase.class,
com.arjuna.wsc11.tests.junit.RegistrationServiceExceptionTestCase.class,
com.arjuna.wsc11.tests.junit.EnduranceTestCase.class
- */
- com.arjuna.wsc11.tests.junit.ActivationServiceTestCase.class
})
public class TestSuite
{
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -88,18 +88,18 @@
<property name="ws-t10.api.classes" value="com/arjuna/wst/BAParticipantManager.class"/>
<property name="ws-t11.api.classes" value="com/arjuna/wst11/BAParticipantManager.class
com/arjuna/wst11/ConfirmCompletedParticipant.class"/>
- <property name="ws-t11.coordinator.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl.class
- com/arjuna/webservices11/wsat/sei/CompletionCoordinatorRPCPortTypeImpl.class
- com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.class
- com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorRPCPortTypeImpl.class
- com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.class
- com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.class
- com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.class"/>
- <property name="ws-t11.participant.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.class
- com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.class
- com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.class"/>
- <property name="ws-t11.client.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.class
- com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.class"/>
+ <property name="ws-t11.coordinator.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl*.class
+ com/arjuna/webservices11/wsat/sei/CompletionCoordinatorRPCPortTypeImpl*.class
+ com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl*.class
+ com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorRPCPortTypeImpl*.class
+ com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl*.class
+ com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl*.class
+ com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl*.class"/>
+ <property name="ws-t11.participant.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl*.class
+ com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl*.class
+ com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl*.class"/>
+ <property name="ws-t11.client.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl*.class
+ com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl*.class"/>
<!--sibling module directories and jars -->
@@ -107,7 +107,7 @@
<property name="wscf.build.lib.dir" value="${wscf.dir}/build/lib"/>
<property name="ws-c.build.lib.dir" value="${ws-c.dir}/build/lib"/>
- <property name="wsas.tests.build.lib.dir" value="${wsas.dir}/tests/build/lib"/>
+ <property name="wsas.tests.build.dir" value="${wsas.dir}/tests/build"/>
<property name="wsas.libs" value="wsas.jar"/>
<property name="wscf.libs" value="wscf.jar"/>
@@ -385,7 +385,7 @@
<target name="tests-compile" depends="tests-compile10, tests-compile11"/>
<target name="tests-jar" depends="tests-compile">
- <jar jarfile="${tests.build.lib.dir}/ws-t-tests.jar">
+ <jar jarfile="${tests.build.lib.dir}/ws-t-tests.jar" manifest="${tests.dd.dir}/META-INF/manifest.mf">
<fileset dir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
</jar>
</target>
@@ -398,8 +398,7 @@
<target name="tests-webapps11">
<copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml"/>
- <war warfile="${tests.build.webapps.dir}/ws-t11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
- </war>
+ <war warfile="${tests.build.webapps.dir}/ws-t11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml" manifest="${tests.dd.dir}/META-INF/manifest.mf"/>
</target>
<target name="tests-webapps" depends="tests-jar, tests-webapps10, tests-webapps11"/>
@@ -409,18 +408,22 @@
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${tests.build.webapps.dir}" includes="ws-t-tests.war ws-t11-tests.war"/>
<fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
- <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
- <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
+ <fileset dir="${wsas.tests.build.dir}/lib" includes="xts-test-servlet.jar"/>
+ <fileset dir="${tests.dd.dir}" includes="META-INF/**/*" excludes="META-INF/**/*manifest.mf"/>
</ear>
</target>
<target name="tests-ear11" if="nobuild10">
- <ear earfile="${tests.build.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t11-tests_application.xml">
+ <mkdir dir="${tests.build.dir}/ext/lib"/>
+ <copy todir="${tests.build.dir}/ext/lib">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ </copy>
+ <ear earfile="${tests.build.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t11-tests_application.xml" manifest="${tests.dd.dir}/META-INF/manifest.mf">
+ <fileset dir="${tests.build.dir}/ext" includes="lib/*"/>
<fileset dir="${tests.build.webapps.dir}" includes="ws-t11-tests.war"/>
- <fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
- <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
- <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
+ <fileset dir="${tests.build.dir}" includes="lib/ws-t-tests.jar"/>
+ <fileset dir="${wsas.tests.build.dir}" includes="lib/xts-test-servlet.jar"/>
+ <fileset dir="${tests.dd.dir}" includes="META-INF/**/*" excludes="META-INF/**/*manifest.mf"/>
</ear>
</target>
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/manifest.mf 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -1 +1 @@
-Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/ws-t11-participant_web-app.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -20,8 +20,6 @@
@author JBoss Inc.
-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Copied: labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/manifest.mf (from rev 37051, labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/manifest.mf)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Copied: labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/war.manifest.mf (from rev 37051, labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/war.manifest.mf)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/war.manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/META-INF/war.manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -34,6 +34,7 @@
</web>
</module>
+ <!--
<module>
<java>ws-t-tests.jar</java>
</module>
@@ -45,4 +46,5 @@
<module>
<java>junit.jar</java>
</module>
+ -->
</application>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -20,9 +20,12 @@
@author JBoss Inc.
-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
-<web-app>
<display-name>Arjuna Web Services Transaction Tests</display-name>
<description>Arjuna Web Services Transaction Tests</description>
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -34,7 +34,7 @@
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
<property name="jboss.server" value="default"/>
- <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+ <property name="deploy.dir" value="${jboss.home}/server/${jboss.server}/deploy}"/>
<!-- internal paths and jars -->
@@ -149,18 +149,22 @@
<target name="tests.webapps" depends="tests.compile">
<copy file="${tests.dd.dir}/wsas-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
</copy>
- <jar jarfile="${tests.build.lib.dir}/wsas-tests.jar" basedir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
+ <jar jarfile="${tests.build.lib.dir}/wsas-tests.jar" basedir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/*.class" manifest="${tests.dd.dir}/manifest.mf"/>
<jar jarfile="${tests.build.lib.dir}/xts-test-servlet.jar" basedir="${tests.build.classes.dir}" includes="com/arjuna/qa/junit/*.class" manifest="${tests.dd.dir}/manifest.mf"/>
- <war warfile="${tests.build.webapps.dir}/wsas-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
+ <war warfile="${tests.build.webapps.dir}/wsas-tests.war" webxml="${tests.build.dd.dir}/web-app.xml" manifest="${tests.dd.dir}/war.manifest.mf">
</war>
</target>
<target name="tests.ear" depends="tests.webapps">
+ <mkdir dir="${tests.build.dir}/ext/lib"/>
+ <copy todir="${tests.build.dir}/ext/lib">
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ </copy>
<ear earfile="${tests.build.webapps.dir}/wsas-tests.ear" appxml="${tests.dd.dir}/wsas-tests_application.xml">
- <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ <fileset dir="${tests.build.dir}/ext" includes="lib/*"/>
<fileset dir="${tests.build.webapps.dir}" includes="wsas-tests.war"/>
- <fileset dir="${tests.build.lib.dir}" includes="wsas-tests.jar"/>
- <fileset dir="${tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
+ <fileset dir="${tests.build.dir}" includes="lib/wsas-tests.jar"/>
+ <fileset dir="${tests.build.dir}" includes="lib/xts-test-servlet.jar"/>
</ear>
</target>
Modified: labs/jbosstm/trunk/XTS/WSAS/tests/dd/manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/dd/manifest.mf 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/dd/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -1 +1 @@
-Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.junit
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Added: labs/jbosstm/trunk/XTS/WSAS/tests/dd/war.manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/dd/war.manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/dd/war.manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Modified: labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_application.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_application.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -33,6 +33,7 @@
<context-root>/wsas-tests</context-root>
</web>
</module>
+ <!--
<module>
<java>wsas-tests.jar</java>
</module>
@@ -42,4 +43,5 @@
<module>
<java>junit.jar</java>
</module>
+ -->
</application>
Modified: labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_web-app.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/dd/wsas-tests_web-app.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -20,9 +20,12 @@
@author JBoss Inc.
-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
-<web-app>
<display-name>Arjuna WSAS Tests</display-name>
<description>Arjuna WSAS Tests</description>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -35,7 +35,7 @@
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
<property name="jboss.server" value="default"/>
- <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+ <property name="deploy.dir" value="${jboss.home}/server/${jboss.server}/deploy}"/>
<!-- internal paths and jars -->
@@ -64,7 +64,7 @@
<!--sibling module directories and jars -->
<property name="wsas.build.lib.dir" value="${wsas.dir}/build/lib"/>
- <property name="wsas.tests.build.lib.dir" value="${wsas.dir}/tests/build/lib"/>
+ <property name="wsas.tests.build.dir" value="${wsas.dir}/tests/build"/>
<property name="wsc.build.lib.dir" value="${ws-c.dir}/build/lib"/>
<property name="wsas.libs" value="wsas.jar"/>
@@ -261,7 +261,7 @@
<target name="tests.compile" depends="tests.init, tests.compile10, tests.compile11"/>
<target name="tests.jar" depends="tests.compile">
- <jar jarfile="${tests.build.webapps.dir}/wscf-tests.jar">
+ <jar jarfile="${tests.build.lib.dir}/wscf-tests.jar" manifest="${tests.dd.dir}/manifest.mf">
<fileset dir="${tests.build.classes.dir}"/>
</jar>
</target>
@@ -274,24 +274,30 @@
<target name="tests.webapps11" depends="tests.compile11">
<copy file="${tests.dd.dir}/wscf11-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app11.xml"/>
- <war warfile="${tests.build.webapps.dir}/wscf11-tests.war" webxml="${tests,build.dd.dir}/web-app11.xml"/>
+ <war warfile="${tests.build.webapps.dir}/wscf11-tests.war" webxml="${tests,build.dd.dir}/web-app11.xml" manifest="${tests.dd.dir}/war.manifest.mf"/>
</target>
<target name="tests.webapps" depends="tests.jar, tests.webapps10, tests.webapps11"/>
<target name="tests.ear-both" if="build10">
- <ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf-tests_application.xml">
+ <ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${tests.build.webapps.dir}" includes="wscf-tests.war wscf11-tests.war wscf-tests.jar"/>
- <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wscf-tests.war wscf11-tests.war"/>
+ <fileset dir="${tests.build.lib.dir}" includes="wscf-tests.jar"/>
+ <fileset dir="${wsas.tests.build.dir}/lib" includes="xts-test-servlet.jar"/>
</ear>
</target>
<target name="tests.ear11" if="nobuild10">
- <ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf11-tests_application.xml">
+ <mkdir dir="${tests.build.dir}/ext/lib"/>
+ <copy todir="${tests.build.dir}/ext/lib">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${tests.build.webapps.dir}" includes="wscf11-tests.war wscf-tests.jar"/>
- <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
+ </copy>
+ <ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf11-tests_application.xml" manifest="${tests.dd.dir}/manifest.mf">
+ <fileset dir="${tests.build.dir}/ext" includes="lib/*"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wscf11-tests.war"/>
+ <fileset dir="${tests.build.dir}" includes="lib/wscf-tests.jar"/>
+ <fileset dir="${wsas.tests.build.dir}" includes="lib/xts-test-servlet.jar"/>
</ear>
</target>
Added: labs/jbosstm/trunk/XTS/WSCF/tests/dd/manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/dd/manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/dd/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Added: labs/jbosstm/trunk/XTS/WSCF/tests/dd/war.manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/dd/war.manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/dd/war.manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_application.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_application.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -33,6 +33,7 @@
<context-root>/wscf11-tests</context-root>
</web>
</module>
+ <!--
<module>
<java>xts-test-servlet.jar</java>
</module>
@@ -42,4 +43,5 @@
<module>
<java>wscf-tests.jar</java>
</module>
+ -->
</application>
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_web-app.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/dd/wscf11-tests_web-app.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -20,9 +20,12 @@
@author JBoss Inc.
-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
-<web-app>
<display-name>Arjuna WSCF 1.1 Tests</display-name>
<description>Arjuna WSCF 1.1 Tests</description>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -112,7 +112,7 @@
<property name="wst.build.lib.dir" value="${ws-t.dir}/build/lib"/>
<property name="wst.build.dd.dir" value="${ws-t.dir}/build/dd"/>
- <property name="wsas.test.build.lib.dir" value="${wsas.dir}/tests/build/lib"/>
+ <property name="wsas.test.build.dir" value="${wsas.dir}/tests/build"/>
<!--sibling module directories and jars -->
@@ -342,7 +342,7 @@
<target name="tests.compile" depends="tests.init, tests.compile10, tests.compile11"/>
<target name="tests.jar" depends="tests.compile">
- <jar jarfile="${tests.build.webapps.dir}/wstx-tests.jar">
+ <jar jarfile="${tests.build.lib.dir}/wstx-tests.jar" manifest="${tests.dd.dir}/META-INF/manifest.mf">
<fileset dir="${tests.build.classes.dir}"/>
</jar>
</target>
@@ -354,7 +354,7 @@
<target name="tests.webapps11">
<copy file="${tests.dd.dir}/wstx11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml"/>
- <war warfile="${tests.build.webapps.dir}/wstx11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml"/>
+ <war warfile="${tests.build.webapps.dir}/wstx11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml" manifest="${tests.dd.dir}/META-INF/war.manifest.mf"/>
</target>
<target name="tests.webapps" depends="tests.jar, tests.webapps10, tests.webapps11"/>
@@ -362,18 +362,24 @@
<target name="tests.ear-both" if="build10">
<ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${tests.build.webapps.dir}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
- <fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
- <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wstx-tests.war wstx11-tests.war"/>
+ <fileset dir="${tests.build.lib.dir}" includes="wstx-tests.jar"/>
+ <fileset dir="${wsas.test.build.dir}/lib" includes="xts-test-servlet.jar"/>
+ <fileset dir="${tests.dd.dir}" includes="META-INF/**/*" excludes="META-INF/**/*manifest.mf"/>
</ear>
</target>
<target name="tests.ear11" if="nobuild10">
- <ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx11-tests_application.xml">
- <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${tests.build.webapps.dir}" includes="wstx11-tests.war wstx-tests.jar"/>
- <fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
- <fileset dir="${tests.dd.dir}" includes="META-INF/**/*"/>
+ <mkdir dir="${tests.build.dir}/ext/lib"/>
+ <copy todir="${tests.build.dir}/ext/lib">
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ </copy>
+ <ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx11-tests_application.xml" manifest="${tests.dd.dir}/META-INF/manifest.mf">
+ <fileset dir="${tests.build.dir}/ext" includes="lib/${tests.libs}"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wstx11-tests.war"/>
+ <fileset dir="${tests.build.dir}" includes="lib/wstx-tests.jar"/>
+ <fileset dir="${wsas.test.build.dir}" includes="lib/xts-test-servlet.jar"/>
+ <fileset dir="${tests.dd.dir}" includes="META-INF/**/*" excludes="META-INF/**/*manifest.mf"/>
</ear>
</target>
Copied: labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/manifest.mf (from rev 37051, labs/jbosstm/trunk/XTS/WSAS/tests/dd/manifest.mf)
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Added: labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/war.manifest.mf
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/war.manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/META-INF/war.manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export
Modified: labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_application.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_application.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -34,6 +34,7 @@
</web>
</module>
+ <!--
<module>
<java>xts-test-servlet.jar</java>
</module>
@@ -45,4 +46,5 @@
<module>
<java>wstx-tests.jar</java>
</module>
+ -->
</application>
Modified: labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_web-app.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx11-tests_web-app.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -20,9 +20,12 @@
@author JBoss Inc.
-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
-<web-app>
<display-name>Arjuna WSTX 1.1 Tests</display-name>
<description>Arjuna WSTX 1.1 Tests</description>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -101,7 +101,7 @@
<fileset dir="${dd.dir}/soapfault/"
includes="wsdl/*"/>
</copy>
- <war destfile="${build.war.file}" webxml="${build.webxml.file}">
+ <war destfile="${build.war.file}" webxml="${build.webxml.file}" manifest="${dd.dir}/manifest.mf">
<classes dir="${build.classes.dir}"/>
<classes dir="${src.dir}" excludes="**/*.java"/>
<!-- need to stop using this at some point soon -->
Copied: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/manifest.mf (from rev 37051, labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/manifest.mf)
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export,com.sun.xml.bind services export
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/proxy/ProxyListenerService.java 2011-06-03 06:40:37 UTC (rev 37063)
@@ -95,6 +95,11 @@
ProxyURIRewriting.setProxyURI(proxyServiceURI) ;
}
+ public void doGet(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse)
+ throws ServletException, IOException
+ {
+ doPost(httpServletRequest, httpServletResponse);
+ }
/**
* Handle the post request.
* @param httpServletRequest The current HTTP servlet request.
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/web.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -20,10 +20,12 @@
* @author JBoss Inc.
-->
-<web-app 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/web-app_2_4.xsd"
- version="2.4">
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
+
<display-name>JBoss WSTF interop</display-name>
<description>JBoss WSTF interop</description>
@@ -54,16 +56,6 @@
<load-on-startup>1</load-on-startup>
</servlet>
- <!-- Define Sc007 JaxWS Server Endpoint Mappings -->
- <servlet-mapping>
- <servlet-name>WSTFSc007InitiatorService</servlet-name>
- <url-pattern>/InitiatorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>WSTFSc007ParticipantService</servlet-name>
- <url-pattern>/ParticipantService</url-pattern>
- </servlet-mapping>
-
<!-- define proxy, logging and junit test runner servlets -->
<servlet>
<servlet-name>HTTPProxyServlet</servlet-name>
@@ -95,6 +87,16 @@
<load-on-startup>1</load-on-startup>
</servlet>
+ <!-- Define Sc007 JaxWS Server Endpoint Mappings -->
+ <servlet-mapping>
+ <servlet-name>WSTFSc007InitiatorService</servlet-name>
+ <url-pattern>/InitiatorService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>WSTFSc007ParticipantService</servlet-name>
+ <url-pattern>/ParticipantService</url-pattern>
+ </servlet-mapping>
+
<!-- servlet mappings -->
<servlet-mapping>
<servlet-name>HTTPProxyServlet</servlet-name>
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -111,7 +111,7 @@
<fileset dir="${dd.dir}/soapfault/"
includes="wsdl/*"/>
</copy>
- <war destfile="${build.war.file}" webxml="${build.webxml.file}">
+ <war destfile="${build.war.file}" webxml="${build.webxml.file}" manifest="${dd.dir}/manifest.mf">
<classes dir="${build.classes.dir}"/>
<classes dir="${src.dir}" excludes="**/*.java"/>
<webinf dir="${dd.dir}/interop11" includes="wsdl/*.wsdl"/>
Copied: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/manifest.mf (from rev 37051, labs/jbosstm/trunk/XTS/WS-C/tests/dd/META-INF/manifest.mf)
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/manifest.mf (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/manifest.mf 2011-06-03 06:40:37 UTC (rev 37063)
@@ -0,0 +1 @@
+Dependencies: org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export,com.sun.xml.bind services export
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/web.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -21,11 +21,11 @@
* @author JBoss Inc.
-->
-<web-app 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/web-app_2_4.xsd"
- version="2.4">
- <display-name>JBoss WSTX1.1 interop</display-name>
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false">
<description>JBoss WSTX1.1 interop</description>
@@ -84,25 +84,6 @@
<load-on-startup>1</load-on-startup>
</servlet>
- <!-- Define Interop 11 JaxWS Server Endpoint Mappings -->
- <servlet-mapping>
- <servlet-name>Interop11ATInitiatorService</servlet-name>
- <url-pattern>/ATInitiatorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Interop11ATParticipantService</servlet-name>
- <url-pattern>/ATParticipantService</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>Interop11BAInitiatorService</servlet-name>
- <url-pattern>/BAInitiatorService</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Interop11BAParticipantService</servlet-name>
- <url-pattern>/BAParticipantService</url-pattern>
- </servlet-mapping>
-
<!-- define proxy, logging and junit test runner servlets -->
<servlet>
<servlet-name>HTTPProxyServlet</servlet-name>
@@ -134,6 +115,25 @@
<load-on-startup>1</load-on-startup>
</servlet>
+ <!-- Define Interop 11 JaxWS Server Endpoint Mappings -->
+ <servlet-mapping>
+ <servlet-name>Interop11ATInitiatorService</servlet-name>
+ <url-pattern>/ATInitiatorService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Interop11ATParticipantService</servlet-name>
+ <url-pattern>/ATParticipantService</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Interop11BAInitiatorService</servlet-name>
+ <url-pattern>/BAInitiatorService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Interop11BAParticipantService</servlet-name>
+ <url-pattern>/BAParticipantService</url-pattern>
+ </servlet-mapping>
+
<!-- servlet mappings -->
<servlet-mapping>
<servlet-name>HTTPProxyServlet</servlet-name>
Modified: labs/jbosstm/trunk/XTS/sar/META-INF/module.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/module.xml 2011-06-03 03:41:38 UTC (rev 37062)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/module.xml 2011-06-03 06:40:37 UTC (rev 37063)
@@ -56,7 +56,9 @@
<module name="javax.transaction"/>
-->
<module name="org.jboss.jts"/>
- <module name="org.jboss.ws.api"/>
+ <module name="org.jboss.ws.api" services="export"/>
+ <module name="org.jboss.ws.jaxws-client" services="export"/>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-client" services="export"/>
<module name="org.jboss.logging"/>
<module name="javax.xml.soap.api"/>
<module name="javax.xml.ws.api"/>
More information about the jboss-svn-commits
mailing list