[jboss-svn-commits] JBL Code SVN: r20019 - in labs/jbosstm/trunk/XTS: WS-C/tests/dd and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 19 07:25:48 EDT 2008
Author: adinn
Date: 2008-05-19 07:25:47 -0400 (Mon, 19 May 2008)
New Revision: 20019
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c-tests_web-app.xml
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/ActivationTestCase.java
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/EnduranceTestCase.java
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/RegistrationTestCase.java
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/ThreadedEnduranceTestCase.java
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/CompletionCoordinatorTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCCoordinatorTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCParticipantTestCase.java
labs/jbosstm/trunk/XTS/WSAS/build.xml
labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/basic/Context.java
labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context1.java
labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context2.java
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel1.java
labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel2.java
labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel3.java
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_web-app.xml
Log:
updated unit tests which were broken by changes made when splitting code to support 1.0 and 1.1 implementations
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2008-05-19 11:25:47 UTC (rev 20019)
@@ -306,10 +306,14 @@
<classes dir="${build.tests.classes.dir}"/>
</war>
<ear earfile="${build.tests.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c-tests_application.xml">
+ <!--
<fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
+ -->
<fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
+ <!--
<fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
<fileset dir="${build.dev.lib.dir}" includes="ws-c10.jar ws-c.jar"/>
+ -->
<fileset dir="${build.tests.webapps.dir}" includes="ws-c-tests.war"/>
</ear>
</target>
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c-tests_web-app.xml 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c-tests_web-app.xml 2008-05-19 11:25:47 UTC (rev 20019)
@@ -1,23 +1,23 @@
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a full listing
- of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU General Public License, v. 2.0.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
- You should have received a copy of the GNU General Public License,
- v. 2.0 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2005-2006,
- @author JBoss Inc.
--->
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
+ of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU General Public License, v. 2.0.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License,
+ v. 2.0 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2005-2006,
+ @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">
@@ -25,51 +25,12 @@
<display-name>Arjuna Web Services Coordination Tests</display-name>
<description>Arjuna Web Services Coordination Tests</description>
-
- <!-- Initialise WS-C services -->
- <listener>
- <listener-class>com.arjuna.webservices.wscoor.server.ActivationCoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wscoor.server.ActivationRequesterInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wscoor.server.RegistrationCoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wscoor.server.RegistrationRequesterInitialisation</listener-class>
- </listener>
-
- <!-- Initialise WS-C -->
- <listener>
- <listener-class>com.arjuna.wsc.messaging.deploy.CoordinationInitialisation</listener-class>
- </listener>
-
- <!-- Initialise the HTTP Client -->
- <listener>
- <listener-class>com.arjuna.webservices.transport.http.HttpClientInitialisation</listener-class>
- </listener>
-
- <!-- Initialise the tests -->
- <listener>
- <listener-class>com.arjuna.wsc.tests.TestInitialisation</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
- <servlet-class>com.arjuna.webservices.transport.http.HttpServiceMultiplexorServlet</servlet-class>
- <!--
- The BaseHttpURI and BaseHttpsURI parameters specify the default values
- used to generate the service URIs without reference to an incoming
- request.
- -->
- <init-param>
- <param-name>BaseHttpURI</param-name>
- <param-value>http://@hostname@:@port@/ws-c-tests/soap/</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
+
+ <!-- Initialise the tests -->
+ <listener>
+ <listener-class>com.arjuna.wsc.tests.TestInitialisation</listener-class>
+ </listener>
+
<servlet>
<servlet-name>JUnit Tests Servlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerServlet</servlet-class>
@@ -79,13 +40,8 @@
</init-param>
<load-on-startup>4</load-on-startup>
</servlet>
-
- <!-- servlet mappings -->
- <servlet-mapping>
- <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
- <url-pattern>/soap/*</url-pattern>
- </servlet-mapping>
-
+
+ <!-- servlet mappings -->
<servlet-mapping>
<servlet-name>JUnit Tests Servlet</servlet-name>
<url-pattern>/index.html</url-pattern>
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/ActivationTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/ActivationTestCase.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/ActivationTestCase.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -33,6 +33,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.SoapRegistry;
+import com.arjuna.webservices.SoapFault10;
import com.arjuna.webservices.stax.URI;
import com.arjuna.webservices.wsaddr.AddressingContext;
import com.arjuna.webservices.wsaddr.AttributedURIType;
@@ -253,7 +254,7 @@
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
final TestActivationRequesterCallback callback = new TestActivationRequesterCallback() {
public void soapFault(final SoapFault soapFault, final AddressingContext addressingContext)
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/EnduranceTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/EnduranceTestCase.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/EnduranceTestCase.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -33,6 +33,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.SoapRegistry;
+import com.arjuna.webservices.SoapFault10;
import com.arjuna.webservices.stax.URI;
import com.arjuna.webservices.wsaddr.AddressingContext;
import com.arjuna.webservices.wsaddr.AttributedURIType;
@@ -271,7 +272,7 @@
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
final TestActivationRequesterCallback callback = new TestActivationRequesterCallback() {
public void soapFault(final SoapFault soapFault, final AddressingContext addressingContext)
@@ -377,7 +378,7 @@
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
final TestRegistrationRequesterCallback callback = new TestRegistrationRequesterCallback() {
public void soapFault(final SoapFault soapFault, final AddressingContext addressingContext)
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/RegistrationTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/RegistrationTestCase.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/RegistrationTestCase.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -33,6 +33,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.SoapRegistry;
+import com.arjuna.webservices.SoapFault10;
import com.arjuna.webservices.wsaddr.AddressingContext;
import com.arjuna.webservices.wsaddr.AttributedURIType;
import com.arjuna.webservices.wsaddr.EndpointReferenceType;
@@ -172,7 +173,7 @@
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
final TestRegistrationRequesterCallback callback = new TestRegistrationRequesterCallback() {
public void soapFault(final SoapFault soapFault, final AddressingContext addressingContext)
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/ThreadedEnduranceTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/ThreadedEnduranceTestCase.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc/tests/junit/ThreadedEnduranceTestCase.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -35,6 +35,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.SoapRegistry;
+import com.arjuna.webservices.SoapFault10;
import com.arjuna.webservices.stax.URI;
import com.arjuna.webservices.wsaddr.AddressingContext;
import com.arjuna.webservices.wsaddr.AttributedURIType;
@@ -236,7 +237,7 @@
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
final TestActivationRequesterCallback callback = new TestActivationRequesterCallback() {
public void soapFault(final SoapFault soapFault, final AddressingContext addressingContext)
@@ -321,7 +322,7 @@
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = CoordinationConstants.WSCOOR_ERROR_CODE_ALREADY_REGISTERED_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
final TestRegistrationRequesterCallback callback = new TestRegistrationRequesterCallback() {
public void soapFault(final SoapFault soapFault, final AddressingContext addressingContext)
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2008-05-19 11:25:47 UTC (rev 20019)
@@ -306,9 +306,11 @@
<javac destdir="${build.tests.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
<pathelement path="${build.dev.lib.dir}/ws-t.jar"/>
+ <pathelement path="${build.dev.lib.dir}/ws-t10.jar"/>
<path refid="tests.lib.path"/>
<path refid="lib.ext.path"/>
<path refid="ws-c.path"/>
+ <path refid="ws-c10.path"/>
</classpath>
<src path="${tests.src.dir}"/>
</javac>
@@ -323,17 +325,23 @@
</copy>
<war warfile="${build.tests.webapps.dir}/ws-t-tests.war" webxml="${build.tests.dd.dir}/web-app.xml">
<manifest>
- <attribute name="Class-Path" value="ws-t.jar ${tests.libs}"/>
+ <attribute name="Class-Path" value="ws-t10.jar ws-t.jar ${tests.libs}"/>
</manifest>
<classes dir="${build.tests.classes.dir}"/>
</war>
<ear earfile="${build.tests.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t-tests_application.xml">
+ <!--
<fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
+ -->
<fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
+ <!--
<fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${build.dev.lib.dir}" includes="ws-t.jar"/>
+ <fileset dir="${build.dev.lib.dir}" includes="ws-t.jar ws-t10.jar"/>
+ -->
<fileset dir="${build.tests.webapps.dir}" includes="ws-t-tests.war"/>
- <fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c.libs}"/>
+ <!--
+ <fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c.libs} ${ws-c10.libs}"/>
+ -->
</ear>
</target>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml 2008-05-19 11:25:47 UTC (rev 20019)
@@ -1,23 +1,23 @@
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a full listing
- of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU General Public License, v. 2.0.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
- You should have received a copy of the GNU General Public License,
- v. 2.0 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2005-2006,
- @author JBoss Inc.
--->
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
+ of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU General Public License, v. 2.0.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License,
+ v. 2.0 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2005-2006,
+ @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">
@@ -25,73 +25,12 @@
<display-name>Arjuna Web Services Transaction Tests</display-name>
<description>Arjuna Web Services Transaction Tests</description>
-
- <!-- Initialise Arjuna TX services -->
- <listener>
- <listener-class>com.arjuna.webservices.wsarjtx.server.TerminationParticipantInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsarjtx.server.TerminationCoordinatorInitialisation</listener-class>
- </listener>
-
- <!-- Initialise WS-AT services -->
- <listener>
- <listener-class>com.arjuna.webservices.wsat.server.CompletionCoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsat.server.CompletionInitiatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsat.server.CoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsat.server.ParticipantInitialisation</listener-class>
- </listener>
-
- <!-- Initialise WS-BA services -->
- <listener>
- <listener-class>com.arjuna.webservices.wsba.server.CoordinatorCompletionCoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsba.server.CoordinatorCompletionParticipantInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsba.server.ParticipantCompletionCoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsba.server.ParticipantCompletionParticipantInitialisation</listener-class>
- </listener>
-
- <!-- Initialise WS-T -->
- <listener>
- <listener-class>com.arjuna.wst.messaging.deploy.TransactionInitialisation</listener-class>
- </listener>
-
- <!-- Initialise the HTTP Client -->
- <listener>
- <listener-class>com.arjuna.webservices.transport.http.HttpClientInitialisation</listener-class>
- </listener>
-
- <!-- Initialise the tests -->
- <listener>
- <listener-class>com.arjuna.wst.tests.TestInitialisation</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
- <servlet-class>com.arjuna.webservices.transport.http.HttpServiceMultiplexorServlet</servlet-class>
- <!--
- The BaseHttpURI and BaseHttpsURI parameters specify the default values
- used to generate the service URIs without reference to an incoming
- request.
- -->
- <init-param>
- <param-name>BaseHttpURI</param-name>
- <param-value>http://@hostname@:@port@/ws-t-tests/soap/</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
+
+ <!-- Initialise the tests -->
+ <listener>
+ <listener-class>com.arjuna.wst.tests.TestInitialisation</listener-class>
+ </listener>
+
<servlet>
<servlet-name>JUnit Tests Servlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.TestRunnerServlet</servlet-class>
@@ -101,13 +40,8 @@
</init-param>
<load-on-startup>4</load-on-startup>
</servlet>
-
- <!-- servlet mappings -->
- <servlet-mapping>
- <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
- <url-pattern>/soap/*</url-pattern>
- </servlet-mapping>
+ <!-- servlet mappings -->
<servlet-mapping>
<servlet-name>JUnit Tests Servlet</servlet-name>
<url-pattern>/index.html</url-pattern>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/CompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/CompletionCoordinatorTestCase.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/CompletionCoordinatorTestCase.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -33,6 +33,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.SoapRegistry;
+import com.arjuna.webservices.SoapFault10;
import com.arjuna.webservices.wsaddr.AddressingContext;
import com.arjuna.webservices.wsaddr.AttributedURIType;
import com.arjuna.webservices.wsaddr.EndpointReferenceType;
@@ -142,7 +143,7 @@
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
final TestCompletionInitiatorCallback callback = new TestCompletionInitiatorCallback() {
public void soapFault(final SoapFault soapFault, final AddressingContext addressingContext, final ArjunaContext arjunaContext)
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCCoordinatorTestCase.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCCoordinatorTestCase.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -35,6 +35,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.SoapRegistry;
+import com.arjuna.webservices.SoapFault10;
import com.arjuna.webservices.wsaddr.AddressingContext;
import com.arjuna.webservices.wsarj.InstanceIdentifier;
import com.arjuna.webservices.wsarj.ArjunaContext;
@@ -119,7 +120,7 @@
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
ParticipantClient.getClient().sendSoapFault(addressingContext, soapFault, new InstanceIdentifier("sender")) ;
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCParticipantTestCase.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst/tests/junit/TwoPCParticipantTestCase.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -35,6 +35,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices.SoapRegistry;
+import com.arjuna.webservices.SoapFault10;
import com.arjuna.webservices.wsaddr.AddressingContext;
import com.arjuna.webservices.wsaddr.AttributedURIType;
import com.arjuna.webservices.wsaddr.EndpointReferenceType;
@@ -162,7 +163,7 @@
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
final QName subcode = ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME ;
- final SoapFault soapFault = new SoapFault(soapFaultType, subcode, reason) ;
+ final SoapFault soapFault = new SoapFault10(soapFaultType, subcode, reason) ;
CoordinatorClient.getClient().sendSoapFault(addressingContext, soapFault, new InstanceIdentifier("sender"));
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2008-05-19 11:25:47 UTC (rev 20019)
@@ -35,6 +35,8 @@
<property name="hostname" value="localhost"/>
<property name="port" value="8080"/>
+ <property name="jboss.client.lib.dir" location="${jboss.dir}/client"/>
+
<property name="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
<property name="com.arjuna.jta.install" location="../../install"/>
@@ -47,6 +49,7 @@
<property name="jta.lib.jars" value="jbossjta.jar"/>
<property name="jta.ext.jars" value="jbossts-common.jar"/>
+ <property name="jboss.client.lib.jars" value="jboss-javaee.jar"/>
<property name="com.arjuna.mwlabs.wsas.resourcebundle" value="wsas_msg_en_US.properties"/>
@@ -83,10 +86,10 @@
<!-- tests library and path to library -->
<property name="tests.libs" value="junit.jar"/>
<property name="tests.depend.libs" value="${tests.libs} ${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <property name="tests.ext.libs" value="servlet.jar"/>
<path id="com.arjuna.mwlabs.wsas.tests.lib.path">
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs} ${tests.ext.libs}"/>
+ <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
+ <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
</path>
<!-- Initialisation -->
Modified: labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/basic/Context.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/basic/Context.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/basic/Context.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -33,6 +33,8 @@
import com.arjuna.mw.wsas.UserActivity;
import com.arjuna.mw.wsas.UserActivityFactory;
+import com.arjuna.mw.wsas.ActivityManagerFactory;
+import com.arjuna.mw.wsas.activity.HLS;
import com.arjuna.mw.wsas.context.ContextManager;
@@ -52,7 +54,12 @@
throws Exception
{
UserActivity ua = UserActivityFactory.userActivity();
+ HLS[] currentHLS = ActivityManagerFactory.activityManager().allHighLevelServices();
+ for (HLS hls : currentHLS) {
+ ActivityManagerFactory.activityManager().removeHLS(hls);
+ }
+
try
{
ua.start();
@@ -70,6 +77,13 @@
fail("Contexts not null: "+contexts);
}
} finally {
+ try {
+ for (HLS hls : currentHLS) {
+ ActivityManagerFactory.activityManager().addHLS(hls);
+ }
+ } catch (Exception e) {
+
+ }
WSASTestUtils.cleanup(ua);
}
}
Modified: labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context1.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context1.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context1.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -37,6 +37,7 @@
import com.arjuna.mw.wsas.ActivityManagerFactory;
import com.arjuna.mw.wsas.UserActivity;
import com.arjuna.mw.wsas.UserActivityFactory;
+import com.arjuna.mw.wsas.activity.HLS;
import com.arjuna.mw.wsas.context.Context;
import com.arjuna.mw.wsas.context.DeploymentContext;
import com.arjuna.mw.wsas.context.DeploymentContextFactory;
@@ -62,6 +63,11 @@
{
UserActivity ua = UserActivityFactory.userActivity();
DemoHLS demoHLS = new DemoHLS();
+ HLS[] currentHLS = ActivityManagerFactory.activityManager().allHighLevelServices();
+
+ for (HLS hls : currentHLS) {
+ ActivityManagerFactory.activityManager().removeHLS(hls);
+ }
try
{
ActivityManagerFactory.activityManager().addHLS(demoHLS);
@@ -144,6 +150,13 @@
throw ex;
} finally {
try {
+ for (HLS hls : currentHLS) {
+ ActivityManagerFactory.activityManager().addHLS(hls);
+ }
+ } catch (Exception ex) {
+ // ignore this
+ }
+ try {
if (demoHLS != null) {
ActivityManagerFactory.activityManager().removeHLS(demoHLS);
}
Modified: labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context2.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context2.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context2.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -37,6 +37,7 @@
import com.arjuna.mw.wsas.ActivityManagerFactory;
import com.arjuna.mw.wsas.UserActivity;
import com.arjuna.mw.wsas.UserActivityFactory;
+import com.arjuna.mw.wsas.activity.HLS;
import com.arjuna.mw.wsas.context.Context;
import com.arjuna.mw.wsas.context.DeploymentContext;
import com.arjuna.mw.wsas.context.DeploymentContextFactory;
@@ -64,6 +65,11 @@
UserActivity ua = UserActivityFactory.userActivity();
DemoHLS demoHLS = new DemoHLS();
FailureHLS failureHLS = new FailureHLS(); // this constructor means it will lnto fail
+ HLS[] currentHLS = ActivityManagerFactory.activityManager().allHighLevelServices();
+
+ for (HLS hls : currentHLS) {
+ ActivityManagerFactory.activityManager().removeHLS(hls);
+ }
try
{
ActivityManagerFactory.activityManager().addHLS(demoHLS);
@@ -163,6 +169,13 @@
throw ex;
} finally {
try {
+ for (HLS hls : currentHLS) {
+ ActivityManagerFactory.activityManager().addHLS(hls);
+ }
+ } catch (Exception ex) {
+ // ignore this
+ }
+ try {
if (demoHLS != null) {
ActivityManagerFactory.activityManager().removeHLS(demoHLS);
}
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2008-05-19 11:25:47 UTC (rev 20019)
@@ -320,6 +320,8 @@
<javac destdir="${com.arjuna.mwlabs.wscf.tests.dest}" debug="yes" optimize="no">
<classpath>
<pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
+ <pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10.jar"/>
+ <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.libs}"/>
<path refid="com.arjuna.mwlabs.wscf.tests.lib.path"/>
<path refid="com.arjuna.mwlabs.wscf.lib.classpath"/>
</classpath>
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel1.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel1.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel1.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -81,7 +81,7 @@
org.w3c.dom.Document implementationDoc = null;
- Class clazz = this.getClass().getClassLoader().loadClass(testProtocolClassName);
+ Class clazz = TopLevel1.class.getClassLoader().loadClass(testProtocolClassName);
ProtocolLocator pl = new ProtocolLocator(clazz);
implementationDoc = pl.getProtocol();
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel2.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel2.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel2.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -69,7 +69,7 @@
try
{
- Class clazz = this.getClass().getClassLoader().loadClass(className);
+ Class clazz = TopLevel1.class.getClassLoader().loadClass(className);
ProtocolLocator pl = new ProtocolLocator(clazz);
implementationDoc = pl.getProtocol();
Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel3.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel3.java 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/as/jta/TopLevel3.java 2008-05-19 11:25:47 UTC (rev 20019)
@@ -70,7 +70,7 @@
try
{
- Class clazz = this.getClass().getClassLoader().loadClass(className);
+ Class clazz = TopLevel1.class.getClassLoader().loadClass(className);
ProtocolLocator pl = new ProtocolLocator(clazz);
implementationDoc = pl.getProtocol();
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2008-05-19 11:25:47 UTC (rev 20019)
@@ -281,7 +281,7 @@
packagenames="${com.arjuna.mwlabs.wstx.htdocs.list}"
>
<classpath>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
+ <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
<path path="${com.arjuna.mwlabs.wstx.src}"/>
</classpath>
</javadoc>
@@ -334,9 +334,11 @@
<target name="com.arjuna.mwlabs.wstx.tests.compile" depends="com.arjuna.mwlabs.wstx.tests.init, com.arjuna.mw.wstx.war">
<javac destdir="${com.arjuna.mwlabs.wstx.tests.dest}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <path refid="com.arjuna.mwlabs.wstx.tests.lib.path"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
+ <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
+ <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10.jar"/>
+ <path refid="com.arjuna.mwlabs.wstx.tests.lib.path"/>
+ <path refid="com.arjuna.mwlabs.wstx.lib.classpath10"/>
+ <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
</classpath>
<src path="${com.arjuna.mwlabs.wstx.tests.src}"/>
</javac>
@@ -356,7 +358,9 @@
<classes dir="${com.arjuna.mwlabs.wstx.tests.dest}"/>
</war>
<ear earfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.ear" appxml="${com.arjuna.mwlabs.wstx.tests.dd}/wstx-tests_application.xml">
+ <!--
<fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
+ -->
<fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
<!-- we don't need to include these libs if we are
deploying to JBossAs. The XTS libs are already
Modified: labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_web-app.xml 2008-05-19 11:24:42 UTC (rev 20018)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/dd/wstx-tests_web-app.xml 2008-05-19 11:25:47 UTC (rev 20019)
@@ -26,73 +26,12 @@
<description>Arjuna WSTX Tests</description>
- <!-- Initialise Arjuna TX services -->
- <listener>
- <listener-class>com.arjuna.webservices.wsarjtx.server.TerminationParticipantInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsarjtx.server.TerminationCoordinatorInitialisation</listener-class>
- </listener>
-
- <!-- Initialise WS-AT services -->
- <listener>
- <listener-class>com.arjuna.webservices.wsat.server.CompletionCoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsat.server.CompletionInitiatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsat.server.CoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsat.server.ParticipantInitialisation</listener-class>
- </listener>
-
- <!-- Initialise WS-BA services -->
- <listener>
- <listener-class>com.arjuna.webservices.wsba.server.CoordinatorCompletionCoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsba.server.CoordinatorCompletionParticipantInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsba.server.ParticipantCompletionCoordinatorInitialisation</listener-class>
- </listener>
- <listener>
- <listener-class>com.arjuna.webservices.wsba.server.ParticipantCompletionParticipantInitialisation</listener-class>
- </listener>
-
- <!-- Initialise WS-T -->
- <listener>
- <listener-class>com.arjuna.wst.messaging.deploy.TransactionInitialisation</listener-class>
- </listener>
-
- <!-- Initialise the HTTP Client -->
- <listener>
- <listener-class>com.arjuna.webservices.transport.http.HttpClientInitialisation</listener-class>
- </listener>
-
<!-- Initialise the tests -->
<listener>
<listener-class>com.arjuna.wstx.tests.TestInitialisation</listener-class>
</listener>
<servlet>
- <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
- <servlet-class>com.arjuna.webservices.transport.http.HttpServiceMultiplexorServlet</servlet-class>
- <!--
- The BaseHttpURI and BaseHttpsURI parameters specify the default values
- used to generate the service URIs without reference to an incoming
- request.
- -->
- <init-param>
- <param-name>BaseHttpURI</param-name>
- <param-value>http://@hostname@:@port@/wstx-tests/soap/</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
<servlet-name>JUnit Tests Servlet</servlet-name>
<servlet-class>com.arjuna.qa.junit.WSTXTestRunnerServlet</servlet-class>
<init-param>
@@ -104,11 +43,6 @@
<!-- servlet mappings -->
<servlet-mapping>
- <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
- <url-pattern>/soap/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>JUnit Tests Servlet</servlet-name>
<url-pattern>/index.html</url-pattern>
</servlet-mapping>
More information about the jboss-svn-commits
mailing list