[jboss-svn-commits] JBL Code SVN: r20933 - in labs/jbosstm/workspace/interop/WSTX10-interop: src/com/jboss/transaction/txinterop/webservices/atinterop and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jul 7 05:54:34 EDT 2008


Author: adinn
Date: 2008-07-07 05:54:34 -0400 (Mon, 07 Jul 2008)
New Revision: 20933

Modified:
   labs/jbosstm/workspace/interop/WSTX10-interop/build.xml
   labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java
   labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java
   labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
   labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java
   labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java
   labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
   labs/jbosstm/workspace/interop/WSTX10-interop/web.xml
Log:
modified interop 1.0 tests to build against JBossTS 4.4 and JBossAS5.0.0.CR1

Modified: labs/jbosstm/workspace/interop/WSTX10-interop/build.xml
===================================================================
--- labs/jbosstm/workspace/interop/WSTX10-interop/build.xml	2008-07-07 09:51:52 UTC (rev 20932)
+++ labs/jbosstm/workspace/interop/WSTX10-interop/build.xml	2008-07-07 09:54:34 UTC (rev 20933)
@@ -9,7 +9,7 @@
 	<property name="host" value="127.0.0.1"/>
 	<property name="port" value="8080"/>
 	
-	<property name="jboss.deploy.dir" location="${env.HOME}/jboss-deploy"/>
+	<property name="jboss.deploy.dir" location="${env.JBOSS_HOME}/server/default/deploy"/>
 	
 	<property name="build.dir" location="build"/>
 	<property name="build.classes.dir" location="${build.dir}/classes"/>
@@ -18,18 +18,40 @@
 	<property name="build.webxml.file" location="${build.lib.dir}/web.xml"/>
 	
 	<property name="src.dir" location="src"/>
+	<property name="conf.dir" location="conf"/>
 	<property name="webxml.file" location="web.xml"/>
 	<property name="lib.dir" location="lib"/>
 	<property name="web.dir" location="web"/>
+	<property name="jboss.client.lib.dir" location="${env.JBOSS_HOME}/client"/>
+	<property name="xts.lib.dir" location="${env.XTS_HOME}/lib"/>
+	<property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
 	
-	<property name="dist.compile.libs" value="ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar jbossjts.jar jbossts-common.jar stax-api-1.0.jar junit-3.8.1.jar saxon8.jar"/>
+	<!--
+	<property name="dist.compile.libs" value="ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar jbossjta.jar jbossts-common.jar stax-api-1.0.jar junit-3.8.1.jar saxon8.jar"/>
+	-->
+	<property name="xts.compile.libs" value="ws-c.jar ws-c10.jar ws-t.jar ws-t10.jar wscf.jar wscf10.jar wstx.jar wstx10.jar wsas.jar"/>
+	<property name="xts.ext.compile.libs" value="jbossjta.jar"/>
+	<property name="jboss.compile.client.libs" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+            jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
+            jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar"/>
+
+	<property name="dist.compile.libs" value="junit.jar saxon.jar"/>
+
+	<!--
 	<property name="dist.dependency.libs" value="wstx-asl-2.0.3.jar"/>
 	<property name="dist.libs" value="${dist.compile.libs} ${dist.dependency.libs}"/>
-	<property name="compile.libs" value="${dist.compile.libs} servlet.jar"/>
+	-->
+	<property name="dist.libs" value="${dist.compile.libs}"/>
+	<property name="dist.xts.libs" value="${xts.compile.libs}"/>
+	<property name="dist.xts.ext.libs" value="${xts.ext.compile.libs}"/>
+
 	<property name="compile.debug" value="true"/>
 	
 	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="${compile.libs}"/>
+		<fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
+		<fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
+		<fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
+		<fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
 	</path>
 	<property name="classpath" refid="classpath"/>
 	
@@ -54,6 +76,8 @@
     			<classes dir="${build.classes.dir}"/>
     			<classes dir="${src.dir}" excludes="**/*.java"/>
     			<lib dir="${lib.dir}" includes="${dist.libs}"/>
+    			<lib dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
+    			<webinf dir="${conf.dir}" includes="*"/>
     			<fileset dir="${web.dir}"/>
     		</war>
     </target>
@@ -62,6 +86,10 @@
 		<copy file="${build.war.file}" todir="${jboss.deploy.dir}"/>
 	</target>
 	
+	<target name="undeploy">
+		<delete file="${jboss.deploy.dir}/interop.war"/>
+	</target>
+
 	<target name="clean">
 		<delete dir="${build.dir}"/>
 	</target>

Modified: labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java	2008-07-07 09:51:52 UTC (rev 20932)
+++ labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/AsyncParticipantStub.java	2008-07-07 09:54:34 UTC (rev 20933)
@@ -4,6 +4,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.SoapFaultType;
+import com.arjuna.webservices.SoapFault10;
 import com.arjuna.webservices.soap.Soap11Details;
 import com.arjuna.webservices.soap.SoapDetails;
 import com.arjuna.webservices.wsaddr.AddressingContext;
@@ -540,11 +541,11 @@
     {
         if (callback.hasFailed())
         {
-            throw new SoapFault(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
+            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
         }
         else if (!callback.hasTriggered())
         {
-            throw new SoapFault(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
+            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
         }
         else if (!callback.isResponse())
         {

Modified: labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java	2008-07-07 09:51:52 UTC (rev 20932)
+++ labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/SyncParticipantClient.java	2008-07-07 09:54:34 UTC (rev 20933)
@@ -4,12 +4,7 @@
 
 import javax.xml.namespace.QName;
 
-import com.arjuna.webservices.HandlerRegistry;
-import com.arjuna.webservices.SoapBody;
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.SoapFaultType;
-import com.arjuna.webservices.SoapMessage;
-import com.arjuna.webservices.SoapService;
+import com.arjuna.webservices.*;
 import com.arjuna.webservices.base.policy.ClientPolicy;
 import com.arjuna.webservices.soap.SoapBodyMessage;
 import com.arjuna.webservices.soap.SoapDetails;
@@ -543,12 +538,12 @@
                         }
                         catch (final ClassCastException cce)
                         {
-                            throw new SoapFault(SoapFaultType.FAULT_RECEIVER, null, "Expected test message response type for element: " + responseName) ;
+                            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, "Expected test message response type for element: " + responseName) ;
                         }
                     }
                     else
                     {
-                        throw new SoapFault(SoapFaultType.FAULT_RECEIVER, null, "Unexpected response element: " + responseName) ;
+                        throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, "Unexpected response element: " + responseName) ;
                     }
                 }
             }

Modified: labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java	2008-07-07 09:51:52 UTC (rev 20932)
+++ labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java	2008-07-07 09:54:34 UTC (rev 20933)
@@ -22,6 +22,7 @@
 
 import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.SoapFault10;
 import com.arjuna.webservices.stax.TextElement;
 import com.arjuna.webservices.wsaddr.AddressingContext;
 import com.arjuna.webservices.wscoor.CoordinationContextType;
@@ -77,7 +78,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -98,7 +99,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -116,7 +117,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -134,7 +135,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -153,7 +154,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -172,7 +173,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -190,7 +191,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -210,7 +211,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -230,7 +231,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -250,7 +251,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -270,7 +271,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -288,7 +289,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -306,7 +307,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -324,7 +325,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -344,7 +345,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -363,7 +364,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -381,7 +382,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }

Modified: labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java	2008-07-07 09:51:52 UTC (rev 20932)
+++ labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/AsyncParticipantStub.java	2008-07-07 09:54:34 UTC (rev 20933)
@@ -4,6 +4,7 @@
 
 import com.arjuna.webservices.SoapFault;
 import com.arjuna.webservices.SoapFaultType;
+import com.arjuna.webservices.SoapFault10;
 import com.arjuna.webservices.soap.Soap11Details;
 import com.arjuna.webservices.soap.SoapDetails;
 import com.arjuna.webservices.wsaddr.AddressingContext;
@@ -221,11 +222,11 @@
     {
         if (callback.hasFailed())
         {
-            throw new SoapFault(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
+            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, "Callback execution failed") ;
         }
         else if (!callback.hasTriggered())
         {
-            throw new SoapFault(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
+            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, "Callback wasn't triggered") ;
         }
         else if (!callback.isResponse())
         {

Modified: labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java	2008-07-07 09:51:52 UTC (rev 20932)
+++ labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/SyncParticipantClient.java	2008-07-07 09:54:34 UTC (rev 20933)
@@ -4,12 +4,7 @@
 
 import javax.xml.namespace.QName;
 
-import com.arjuna.webservices.HandlerRegistry;
-import com.arjuna.webservices.SoapBody;
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.SoapFaultType;
-import com.arjuna.webservices.SoapMessage;
-import com.arjuna.webservices.SoapService;
+import com.arjuna.webservices.*;
 import com.arjuna.webservices.base.policy.ClientPolicy;
 import com.arjuna.webservices.soap.SoapBodyMessage;
 import com.arjuna.webservices.soap.SoapDetails;
@@ -257,12 +252,12 @@
                         }
                         catch (final ClassCastException cce)
                         {
-                            throw new SoapFault(SoapFaultType.FAULT_RECEIVER, null, "Expected test message response type for element: " + responseName) ;
+                            throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, "Expected test message response type for element: " + responseName) ;
                         }
                     }
                     else
                     {
-                        throw new SoapFault(SoapFaultType.FAULT_RECEIVER, null, "Unexpected response element: " + responseName) ;
+                        throw new SoapFault10(SoapFaultType.FAULT_RECEIVER, null, "Unexpected response element: " + responseName) ;
                     }
                 }
             }

Modified: labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java	2008-07-07 09:51:52 UTC (rev 20932)
+++ labs/jbosstm/workspace/interop/WSTX10-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java	2008-07-07 09:54:34 UTC (rev 20933)
@@ -22,6 +22,7 @@
 
 import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.SoapFault10;
 import com.arjuna.webservices.wsaddr.AddressingContext;
 import com.arjuna.webservices.wscoor.CoordinationContextType;
 import com.arjuna.wsc.messaging.MessageId;
@@ -71,7 +72,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -92,7 +93,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -110,7 +111,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -131,7 +132,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -152,7 +153,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }
@@ -173,7 +174,7 @@
         }
         catch (final Throwable th)
         {
-            sendFault(addressingContext, new SoapFault(th)) ;
+            sendFault(addressingContext, new SoapFault10(th)) ;
         }
         sendResponse(addressingContext) ;
     }

Modified: labs/jbosstm/workspace/interop/WSTX10-interop/web.xml
===================================================================
--- labs/jbosstm/workspace/interop/WSTX10-interop/web.xml	2008-07-07 09:51:52 UTC (rev 20932)
+++ labs/jbosstm/workspace/interop/WSTX10-interop/web.xml	2008-07-07 09:54:34 UTC (rev 20933)
@@ -17,6 +17,16 @@
         <param-value>10</param-value>
     </context-param>
     
+    <filter>
+      	<filter-name>HTTP Content Type filter</filter-name>
+      	<filter-class>com.arjuna.webservices.transport.http.HttpContentTypeFilter</filter-class>
+    </filter>
+    
+    <filter-mapping>
+      	<filter-name>HTTP Content Type filter</filter-name>
+        <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
+    </filter-mapping>
+
     <listener>
         <listener-class>com.arjuna.services.framework.admin.TaskManagerInitialisation</listener-class>
     </listener>
@@ -26,77 +36,6 @@
         <listener-class>com.arjuna.webservices.transport.http.HttpClientInitialisation</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://@HOST@:@PORT@/interop/soap/</param-value>
-        </init-param>
-        <!--
-        <init-param>
-            <param-name>BaseHttpsURI</param-name>
-            <param-value>https://localhost:8080/arjuna/soap/</param-value>
-        </init-param>
-        <init-param>
-            <param-name>LogPackets</param-name>
-            <param-value>true</param-value>
-        </init-param>
-        -->
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <servlet>
-        <servlet-name>HTTP Proxy Servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.txinterop.proxy.ProxyListenerService</servlet-class>
-        <!--
-          The base URI of the proxy servlet.
-         -->
-        <init-param>
-            <param-name>proxyServiceURI</param-name>
-            <param-value>http://@HOST@:@PORT@/interop/proxy</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>JUnit test servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.txinterop.test.TestServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <servlet>
-        <servlet-name>Log servlet</servlet-name>
-        <servlet-class>com.jboss.transaction.txinterop.test.TestLogServlet</servlet-class>
-        <load-on-startup>1</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-mapping>
-        <servlet-name>HTTP Proxy Servlet</servlet-name>
-        <url-pattern>/proxy/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>JUnit test servlet</servlet-name>
-        <url-pattern>/test</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>Log servlet</servlet-name>
-        <url-pattern>/logs/*</url-pattern>
-    </servlet-mapping>
-    
     <!-- Initialise WS-C services -->
     <listener>
         <listener-class>com.arjuna.webservices.wscoor.server.ActivationCoordinatorInitialisation</listener-class>
@@ -167,17 +106,6 @@
         <listener-class>com.arjuna.mw.wst.deploy.WSTXInitialisation</listener-class>
     </listener>
 
-    <filter>
-      	<filter-name>HTTP Content Type filter</filter-name>
-      	<filter-class>com.arjuna.webservices.transport.http.HttpContentTypeFilter</filter-class>
-    </filter>
-    
-    <filter-mapping>
-      	<filter-name>HTTP Content Type filter</filter-name>
-        <servlet-name>HTTP SOAP Service Multiplexor Servlet</servlet-name>
-    </filter-mapping>
-
-    
     <!-- Initialise interop services -->
     <listener>
         <listener-class>com.jboss.transaction.txinterop.webservices.server.ParticipantInitialisation</listener-class>
@@ -189,6 +117,78 @@
         <listener-class>com.jboss.transaction.txinterop.webservices.bainterop.server.BAInitiatorInitialisation</listener-class>
     </listener>
     
+    <!-- Initialise the HTTP client servlet -->
+    <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://@HOST@:@PORT@/interop/soap/</param-value>
+        </init-param>
+        <!--
+        <init-param>
+            <param-name>BaseHttpsURI</param-name>
+            <param-value>https://localhost:8080/arjuna/soap/</param-value>
+        </init-param>
+        <init-param>
+            <param-name>LogPackets</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        -->
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    
+    <servlet>
+        <servlet-name>HTTP Proxy Servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.txinterop.proxy.ProxyListenerService</servlet-class>
+        <!--
+          The base URI of the proxy servlet.
+         -->
+        <init-param>
+            <param-name>proxyServiceURI</param-name>
+            <param-value>http://@HOST@:@PORT@/interop/proxy</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JUnit test servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.txinterop.test.TestServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    
+    <servlet>
+        <servlet-name>Log servlet</servlet-name>
+        <servlet-class>com.jboss.transaction.txinterop.test.TestLogServlet</servlet-class>
+        <load-on-startup>1</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-mapping>
+        <servlet-name>HTTP Proxy Servlet</servlet-name>
+        <url-pattern>/proxy/*</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>JUnit test servlet</servlet-name>
+        <url-pattern>/test</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>Log servlet</servlet-name>
+        <url-pattern>/logs/*</url-pattern>
+    </servlet-mapping>
+    
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
     </welcome-file-list>




More information about the jboss-svn-commits mailing list