[jboss-svn-commits] JBL Code SVN: r16748 - in labs/jbosstm/trunk/XTS/demo: dd and 10 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Nov 22 07:02:13 EST 2007


Author: maciej.machulak
Date: 2007-11-22 07:02:13 -0500 (Thu, 22 Nov 2007)
New Revision: 16748

Added:
   labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxws-handlers-client.xml
   labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxws-handlers-server.xml
   labs/jbosstm/trunk/XTS/demo/dd/jboss/service-jaxws-web-app.xml
   labs/jbosstm/trunk/XTS/demo/web/images/jboss.gif
Removed:
   labs/jbosstm/trunk/XTS/demo/build.bat
   labs/jbosstm/trunk/XTS/demo/build.sh
   labs/jbosstm/trunk/XTS/demo/dd/jboss/wsdl/RestaurantServiceAT.wsdl
   labs/jbosstm/trunk/XTS/demo/dd/jboss/wsdl/RestaurantServiceBA.wsdl
   labs/jbosstm/trunk/XTS/demo/dd/weblogic/
   labs/jbosstm/trunk/XTS/demo/dd/webmethods/
   labs/jbosstm/trunk/XTS/demo/jboss.properties
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/weblogic/
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/webmethods/
   labs/jbosstm/trunk/XTS/demo/weblogic.properties
   labs/jbosstm/trunk/XTS/demo/webmethods.properties
Modified:
   labs/jbosstm/trunk/XTS/demo/BUILDING
   labs/jbosstm/trunk/XTS/demo/build.xml
   labs/jbosstm/trunk/XTS/demo/dd/jboss/application.xml
   labs/jbosstm/trunk/XTS/demo/dd/jboss/client-jaxrpc-mapping.xml
   labs/jbosstm/trunk/XTS/demo/dd/jboss/client-web-app.xml
   labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxrpc-mapping.xml
   labs/jbosstm/trunk/XTS/demo/dd/jboss/service-web-app.xml
   labs/jbosstm/trunk/XTS/demo/dd/jboss/webservices.xml
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/BasicClient.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/restaurant/IRestaurantServiceAT.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/restaurant/IRestaurantServiceBA.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/IRestaurantService.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/IRestaurantServiceBA.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantManager.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceAT.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceBA.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantView.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiManager.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiServiceAT.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiServiceBA.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiView.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreManager.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreServiceAT.java
   labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreView.java
   labs/jbosstm/trunk/XTS/demo/web/index.jsp
Log:
JBTM-277

- added header context processors for JAX-WS.
- code refactoring 



Modified: labs/jbosstm/trunk/XTS/demo/BUILDING
===================================================================
--- labs/jbosstm/trunk/XTS/demo/BUILDING	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/BUILDING	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,18 +15,29 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
 # MA  02110-1301, USA.
 # 
-# (C) 2005-2006,
+# (C) 2007,
 # @author JBoss Inc.
 #
 
-This demo has been written for, and tested on, JBoss4.0.3SP1.  Please download
-and install this app server from the JBoss website.
+This demo has been written for, and tested on, JBoss Application Server 4.2.1.GA.  
+Please download and install this app server from the JBoss website. This demo has
+been tested on JBoss Transaction Service 4.4.
 
 Follow these steps to build the demo for JBoss
- - edit jboss.properties and replace variables as directed in the comments
- - add java and ant to your path
- - execute 'sh build.sh jboss clean build' on unix or
-   'build.bat jboss clean build' on windows
- - deploy the generated ear file into an instance of JBoss4.0.3SP 1
 
-Open a browser and enter the xts-demo url (e.g. http://localhost:8080/xts-demo)
+1) Add 'java' and 'ant' to your path
+
+2) Edit 'build.xml' and replace properties as directed in the comments
+
+3) Execute 'ant build'
+   This compiles necessary classes and produces the 'xts-demo.ear' file.
+
+4) Execute 'ant deploy'
+   This deploys the generated ear file into an instance of the JBoss Application
+   Server
+
+To start using the demo application open a browser and enter the xts-demo url 
+(e.g. http://localhost:8080/xts-demo)
+
+To undeploy the demo application execute 'ant undeploy' - this deletes the
+'xts-demo.ear' file from the deployment directory of the JBoss AS.

Deleted: labs/jbosstm/trunk/XTS/demo/build.bat
===================================================================
--- labs/jbosstm/trunk/XTS/demo/build.bat	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/build.bat	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,45 +0,0 @@
-rem
-rem JBoss, Home of Professional Open Source
-rem Copyright 2006, Red Hat Middleware LLC, and individual contributors
-rem as indicated by the @author tags. 
-rem See the copyright.txt in the distribution for a full listing 
-rem of individual contributors.
-rem This copyrighted material is made available to anyone wishing to use,
-rem modify, copy, or redistribute it subject to the terms and conditions
-rem of the GNU General Public License, v. 2.0.
-rem This program is distributed in the hope that it will be useful, but WITHOUT A 
-rem WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
-rem PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-rem You should have received a copy of the GNU General Public License,
-rem v. 2.0 along with this distribution; if not, write to the Free Software
-rem Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-rem MA  02110-1301, USA.
-rem 
-rem (C) 2005-2006,
-rem @author JBoss Inc.
-rem
- at echo off
-rem ###########################################################################
-rem # Wrapper script for building and deploying xts-demo                      #
-rem # Usage: build.bat [weblogic|jboss] <target>                              #
-rem ###########################################################################
-
-if "%OS" == "Windows_NT" @setlocal
-
-set PROGRAM=build.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0
-
-if "%1" == "" goto USAGE
-
-set PROPERTYFILE=%1.properties
-if exist "%PROPERTYFILE%" goto RUN
-
-:USAGE
-echo Usage: %PROGRAM% [weblogic|jboss|webmethods] <target>
-goto END
-
-:RUN
-shift
-ant -Dxmlpropertyfile="%PROPERTYFILE%" %1 %2 %3 %4 %5 %6 %7 %8 %9
-:END
-if "%OS" == "Windows_NT" @endlocal

Deleted: labs/jbosstm/trunk/XTS/demo/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/demo/build.sh	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/build.sh	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,38 +0,0 @@
-#
-# 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.
-#
-#!/bin/sh
-###############################################################################
-# Wrapper script for building and deploying xts-demo                          #
-# Usage: build.sh [weblogic|jboss] <target>                                   #
-###############################################################################
-
-if [ $# -ge 1 ]
-then
-  propertyfile=$1.properties
-  if [ -f "$propertyfile" ]
-  then
-    shift
-    exec ant -Dxmlpropertyfile $propertyfile "$@"
-  fi
-fi
-
-echo "Usage: `basename $0` [weblogic|jboss|webmethods] <target>"
-exit 1

Modified: labs/jbosstm/trunk/XTS/demo/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/build.xml	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/build.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,12 +15,10 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
   MA  02110-1301, USA.
 
-  (C) 2005-2006,
+  (C) 2005-2007,
   @author JBoss Inc.
 -->
 
-<!-- $Id: build.xml,v 1.18.4.1 2005/11/22 10:42:06 kconner Exp $ -->
-
 <!-- ====================================================================== -->
 <!--                                                                        -->
 <!--           Copyright (c) 2003, Arjuna Technologies Limited.             -->
@@ -31,50 +29,52 @@
 
 <project name="xts-demo" default="build" basedir=".">
 
-    <!-- ================================================================== -->
 
-    <!-- Specify weblogic.home if you want a WebLogic build,                -->
-    <!-- webmethods.home for a webMethods build otherwise a JBoss build     -->
-    <!-- will be generated.                                                 -->
+    <!--
+         You need to set following properties:
 
-    <!-- The properties to override are the following:                      -->
-    <!--    hostname (defaults to localhost)                                -->
-    <!--    port (defaults to 8080 for jboss, 7001 for WebLogic and         -->
-    <!--          8004 for webMethods)                                      -->
-    <!--    urlstub (defaults to xtsdemowebservices for JBoss and WebLogic  -->
-    <!--          and xts-demo for webMethods)                              -->
+         hostname      - the hostname of the JBoss installation (e.g. localhost)
+         port          - the port of the JBoss web server (e.g. 8080)
+         urlstub       - the url stub for the demo webservices (e.g. xtsdemowebservices)
+         jboss.dir     - the deploy directory of the JBoss instance (e.g. /usr/local/jboss-4.2.1.GA)
+         jboss.profile - the profile of the JBoss Application Server (e.g. default)
+    -->
 
-    <!--    deploy.dir The deployment directory for the ear                 -->
-    <!-- ================================================================== -->
+    <property name="hostname" value="localhost"/>
+    <property name="port" value="8080"/>
+    <property name="urlstub" value="xtsdemowebservices"/>
+    <property name="jboss.dir" value="/home/raistlin/Desktop/RedHat/jboss-4.2.1.GA"/>
+    <property name="jboss.profile" value="default"/>
 
-    <property name="xtsinstalled.home" location="../xts-install" />
-    <property name="distrib.dir" location="${xtsinstalled.home}/demo"/>
-    <property name="conf.dir" location="${xtsinstalled.home}/conf"/>
 
-    <property name="lib.dir" location="${xtsinstalled.home}/lib"/>
-    <property name="ext.dir" location="${lib.dir}/ext"/>
+    <!-- You should not need to modify anything below this point -->
 
+    <!-- JBoss Application Server libraries -->
+    <property name="jboss.server.dir" value="${jboss.dir}/server/${jboss.profile}"/>
+    <property name="jboss.deploy.dir" value="${jboss.server.dir}/deploy"/>
     <property name="lib.libs" value="wstx.jar ws-t.jar ws-c.jar"/>
     <property name="ext.libs" value="jbossjta.jar"/>
     <property name="ext.compile" value="${ext.libs} jaxrpc.jar servlet.jar"/>
-
     <property name="ext.package" value="${ext.libs} jbossts-common.jar commons-logging.jar stax-api-1.0.jar wstx-asl-2.0.3.jar"/>
 
+    <!-- XML Transaction Service -->
+    <property name="xtsinstalled.home" location="../xts-install" />
+    <property name="distrib.dir" location="${xtsinstalled.home}/demo"/>
+    <property name="conf.dir" location="${xtsinstalled.home}/conf"/>
+
     <!-- ================================================================== -->
 
+
     <property name="build.dir" location="build"/>
     <property name="src.dir" location="src"/>
     <property name="web.dir" location="web"/>
     <property name="dd.dir" location="dd"/>
     <property name="jboss.dd.dir" location="${dd.dir}/jboss"/>
-    <property name="webmethods.dd.dir" location="${dd.dir}/webmethods"/>
-    <property name="weblogic.dd.dir" location="${dd.dir}/weblogic"/>
     <property name="build.config" location="${build.dir}/config"/>
     <property name="build.soapconfig" location="${build.dir}/soapconfig"/>
     <property name="appinf.dir" location="${build.dir}/APP-INF"/>
     <property name="appinflib.dir" location="${appinf.dir}/lib"/>
 
-    <property name="webmethods.build.dir" location="${build.dir}/xts-demo"/>
 
     <property name="docs.dir" location="docs"/>
     <property name="xsl.dir"  location="xsl"/>
@@ -85,23 +85,11 @@
     <property name="javac.optimize"     value="off"/>
     <property name="javac.deprecation"  value="on"/>
 
-    <path id="lib.path">
-        <fileset dir="${lib.dir}" includes="${lib.libs}"/>
-    </path>
-    <path id="ext.path">
-        <fileset dir="${ext.dir}" includes="${ext.compile}"/>
-    </path>
-
     <filterset id="webxml.filter">
-        <filter token="restaurantATURL" value="${restaurantATURL}"/>
-        <filter token="restaurantBAURL" value="${restaurantBAURL}"/>
-        <filter token="taxiATURL" value="${taxiATURL}"/>
-        <filter token="taxiBAURL" value="${taxiBAURL}"/>
-        <filter token="theatreATURL" value="${theatreATURL}"/>
-        <filter token="theatreBAURL" value="${theatreBAURL}"/>
-        <filter token="hostname" value="${hostname}"/>
-        <filter token="port" value="${port}"/>
-        <filter token="urlstub" value="${urlstub}"/>
+        <filter token="taxiATURL" value="http://${hostname}:${port}/${urlstub}/TaxiServiceAT"/>
+        <filter token="taxiBAURL" value="http://${hostname}:${port}/${urlstub}/TaxiServiceBA"/>
+        <filter token="theatreATURL" value="http://${hostname}:${port}/${urlstub}/TheatreServiceAT"/>
+        <filter token="theatreBAURL" value="http://${hostname}:${port}/${urlstub}/TheatreServiceBA"/>
     </filterset>
 
     <target name="clean">
@@ -115,51 +103,42 @@
         </delete>
     </target>
 
-    <target name="init-build">
-        <condition property="jboss.build">
-            <not>
-                <or>
-                    <isset property="weblogic.home"/>
-                    <isset property="webmethods.home"/>
-                </or>
-            </not>
-        </condition>
-    </target>
-
-    <target name="init-properties-weblogic" depends="init-build" if="weblogic.home">
-        <property name="hostname" value="localhost"/>
-        <property name="port" value="7001"/>
-        <property name="urlstub" value="xtsdemowebservices"/>
+    <target name="init-properties" depends="clean">
         <path id="compile.path">
-            <path refid="lib.path"/>
-            <path refid="ext.path"/>
-            <fileset dir="${weblogic.home}/server/lib" includes="webservices.jar"/>
+	    <fileset dir="${jboss.server.dir}/lib">
+            <include name="log4j.jar"/>
+            <include name="jboss-ejb3x.jar"/>
+            <include name="ejb-3_0-api.jar"/>
+            <include name="ejb3-persistence.jar"/>
+            <include name="jboss-ejb3x.jar"/>
+            <include name="jboss-saaj.jar"/>
+            <include name="jboss-j2ee.jar"/>
+            <include name="commons-logging.jar"/>
+            <include name="servlet-api.jar"/>
+            <include name="jboss-jaxrpc.jar"/>
+            <include name="jboss-saaj.jar"/>
+            <include name="commons-logging.jar"/>
+            <include name="jbossjta.jar"/>
+            <include name="jbossts-common.jar"/>
+        </fileset>
+            <fileset dir="${jboss.deploy.dir}/jbossws.sar">
+            <include name="jbossws-core.jar"/>
+            <include name="jboss-jaxws.jar"/>
+            <include name="stax-api.jar"/>
+	    </fileset>
+	    <fileset dir="${jboss.deploy.dir}/jbossxts.sar">
+            <include name="stax-api-1.0.jar"/>
+            <include name="ws-c.jar"/>
+            <include name="ws-t.jar"/>
+            <include name="wsas.jar"/>
+            <include name="wscf.jar"/>
+            <include name="wstx-asl-2.0.3.jar"/>
+            <include name="wstx.jar"/>
+        </fileset>
         </path>
     </target>
 
-    <target name="init-properties-webmethods" depends="init-build" if="webmethods.home">
-        <property name="hostname" value="localhost"/>
-        <property name="port" value="8004"/>
-        <property name="urlstub" value="xts-demo"/>
-        <path id="compile.path">
-            <path refid="lib.path"/>
-            <path refid="ext.path"/>
-            <pathelement location="${webmethods.home}/lib/glue.jar"/>
-        </path>
-        <property name="webmethods.deploy.dir" location="${deploy.dir}/xts-demo"/>
-    </target>
-
-    <target name="init-properties" depends="init-build" if="jboss.build">
-        <property name="hostname" value="localhost"/>
-        <property name="port" value="8080"/>
-        <property name="urlstub" value="xtsdemowebservices"/>
-        <path id="compile.path">
-            <path refid="lib.path"/>
-            <path refid="ext.path"/>
-        </path>
-    </target>
-
-    <target name="init" depends="init-properties-weblogic,init-properties-webmethods,init-properties">
+    <target name="init" depends="init-properties">
         <mkdir dir="${build.dir}"/>
         <mkdir dir="${build.dir}/classes"/>
         <mkdir dir="${build.config}"/>
@@ -177,9 +156,7 @@
             </classpath>
             <src path="${src.dir}"/>
             <patternset>
-                <include name="com/arjuna/xts/nightout/clients/jboss/**" if="jboss.build"/>
-                <include name="com/arjuna/xts/nightout/clients/weblogic/**" if="weblogic.home"/>
-                <include name="com/arjuna/xts/nightout/clients/webmethods/**" if="webmethods.home"/>
+                <include name="com/arjuna/xts/nightout/clients/jboss/**"/>
                 <include name="com/arjuna/xts/nightout/services/**"/>
             </patternset>
         </javac>
@@ -195,26 +172,12 @@
         <jar destfile="${build.dir}/config.jar" basedir="${build.config}"/>
     </target>
 
-    <target name="weblogic-webservices" depends="compile" if="weblogic.home">
-        <copy file="${weblogic.dd.dir}/web-services.xml" tofile="${build.dir}/web-services.xml"/>
-        <war destfile="${build.dir}/xts-demo-webservices.war" webxml="${weblogic.dd.dir}/web.xml">
-            <webinf dir="${build.dir}">
-                <include name="web-services.xml"/>
-            </webinf>
-            <classes dir="${build.dir}/classes">
-                <include name="com/arjuna/xts/nightout/services/**/*"/>
-            </classes>
-            <manifest>
-                <attribute name="Class-Path" value="${lib.libs} ${ext.libs}"/>
-            </manifest>
-        </war>
-    </target>
-
-    <target name="jboss-webservices" depends="compile" if="jboss.build">
+    <target name="jboss-webservices" depends="compile">
         <war destfile="${build.dir}/xts-demo-webservices.war" webxml="${jboss.dd.dir}/service-web-app.xml">
-            <webinf dir="${jboss.dd.dir}" excludes="service-web-app.xml client-web-app.xml"/>
+            <webinf dir="${jboss.dd.dir}" includes="jaxrpc-mapping.xml webservices.xml wsdl/*"/>
             <fileset dir="${build.dir}/classes">
                 <include name="com/arjuna/xts/nightout/services/**"/>
+                <exclude name="com/arjuna/xts/nightout/services/Restaurant/**"/>
             </fileset>
             <manifest>
                 <attribute name="Class-Path" value="${lib.libs} ${ext.libs}"/>
@@ -222,121 +185,42 @@
         </war>
     </target>
 
-    <!-- the client side elements -->
-    <target name="weblogic-webapp" depends="compile" if="weblogic.home">
-        <copy tofile="${build.dir}/client-web-app.xml" file="${weblogic.dd.dir}/web-app.xml">
-            <filterset refid="webxml.filter"/>
-        </copy>
-
-        <!-- move resources into the classes directory -->
-        <copy todir="${build.dir}/classes/">
-            <fileset dir="${src.dir}" includes="com/arjuna/xts/nightout/clients/weblogic/**/*.xml"/>
-        </copy>
-
-        <war warfile="${build.dir}/xts-demo.war" webxml="${build.dir}/client-web-app.xml">
-            <classes dir="${build.dir}/classes">
-                <exclude name="com/arjuna/xts/nightout/services/**/*"/>
-            </classes>
-            <fileset dir="${web.dir}"/>
+    <target name="jboss-jaxws-webservices" depends="compile">
+        <copy file="${jboss.dd.dir}/jaxws-handlers-server.xml" todir="${build.dir}/classes/com/arjuna/xts/nightout/services/Restaurant"/>
+        <war destfile="${build.dir}/xts-demo-jaxws-webservices.war" webxml="${jboss.dd.dir}/service-jaxws-web-app.xml">
+            <fileset dir="${build.dir}/classes">
+                <include name="com/arjuna/xts/nightout/services/Restaurant/**"/>
+            </fileset>
             <manifest>
-                <attribute name="Class-Path" value="wstx.jar"/>
+                <attribute name="Class-Path" value="${lib.libs} ${ext.libs}"/>
             </manifest>
         </war>
     </target>
 
-    <target name="jboss-webapp" depends="compile" if="jboss.build">
+    <!-- the client side elements -->
+    <target name="jboss-webapp" depends="compile">
         <copy tofile="${build.dir}/client-web-app.xml" file="${jboss.dd.dir}/client-web-app.xml">
             <filterset refid="webxml.filter"/>
         </copy>
 
         <war warfile="${build.dir}/xts-demo.war" webxml="${build.dir}/client-web-app.xml">
-            <classes dir="${build.dir}/classes">
-                <exclude name="com/arjuna/xts/nightout/services/**/*"/>
-            </classes>
+            <fileset dir="${build.dir}/classes">
+                <include name="com/arjuna/xts/nightout/clients/**/*"/>
+            </fileset>
             <fileset dir="${web.dir}"/>
             <manifest>
                 <attribute name="Class-Path" value="wstx.jar"/>
             </manifest>
-            <webinf dir="${jboss.dd.dir}" includes="wsdl/**, client-jaxrpc-mapping.xml"/>
+            <webinf dir="${jboss.dd.dir}" includes="wsdl/** client-jaxrpc-mapping.xml"/>
         </war>
     </target>
 
-    <target name="weblogic-ear" depends="weblogic-webservices, weblogic-webapp, config" if="weblogic.home">
-        <copy todir="${appinflib.dir}">
-	        <fileset dir="${xtsinstalled.home}/lib" includes="*.jar"/>
-	        <fileset dir="${xtsinstalled.home}/lib/ext" includes="${ext.package}"/>
-            <fileset dir="${build.dir}" includes="config.jar"/>
-        </copy>
-        <ear earfile="${build.dir}/xts-demo.ear" appxml="${weblogic.dd.dir}/application.xml">
-            <fileset dir="${xtsinstalled.home}/webapps" includes="*.war"/>
-            <fileset dir="${build.dir}" includes="xts-demo-webservices.war xts-demo.war"/>
-            <fileset dir="${build.dir}" includes="APP-INF/**"/>
+    <target name="build" depends="jboss-webservices, jboss-jaxws-webservices, jboss-webapp, config">
+        <ear earfile="${build.dir}/xts-demo.ear" appxml="${jboss.dd.dir}/application.xml">
+            <fileset dir="${build.dir}" includes="xts-demo-jaxws-webservices.war xts-demo-webservices.war xts-demo.war"/>
         </ear>
     </target>
 
-    <target name="jboss-ear" depends="jboss-webapp, config" if="jboss.build">
-        <ear earfile="${build.dir}/xts-demo.ear"
-            appxml="${jboss.dd.dir}/application.xml">
-            <fileset dir="${build.dir}" includes="xts-demo-webservices.war xts-demo.war config.jar"/>
-	        <fileset dir="${xtsinstalled.home}/lib" includes="*.jar"/>
-	        <fileset dir="${xtsinstalled.home}/lib/ext" includes="${ext.package}"/>
-	        <fileset dir="${xtsinstalled.home}/webapps" includes="*.war"/>
-        </ear>
-    </target>
-
-    <target name="webmethods-app" depends="config" if="webmethods.home">
-        <mkdir dir="${webmethods.build.dir}"/>
-        <property name="webmethods.webinf.dir" location="${webmethods.build.dir}/WEB-INF"/>
-        <property name="webmethods.classes.dir" location="${webmethods.webinf.dir}/classes"/>
-        <property name="webmethods.lib.dir" location="${webmethods.webinf.dir}/lib"/>
-        <property name="webmethods.services.dir" location="${webmethods.webinf.dir}/services"/>
-
-        <mkdir dir="${webmethods.webinf.dir}"/>
-        <mkdir dir="${webmethods.classes.dir}"/>
-        <mkdir dir="${webmethods.lib.dir}"/>
-        <mkdir dir="${webmethods.services.dir}"/>
-        <mkdir dir="${build.soapconfig}/services"/>
-
-        <copy todir="${webmethods.build.dir}">
-            <fileset dir="${web.dir}"/>
-        </copy>
-        <copy todir="${webmethods.webinf.dir}" file="${webmethods.dd.dir}/glue-config.xml">
-          <filterset>
-            <filter token="hostname" value="${hostname}"/>
-            <filter token="port" value="${port}"/>
-          </filterset>
-        </copy>
-        <copy tofile="${webmethods.webinf.dir}/web.xml" file="${webmethods.dd.dir}/web-app.xml">
-          <filterset refid="webxml.filter"/>
-        </copy>
-
-        <copy todir="${webmethods.classes.dir}">
-          <fileset dir="${build.dir}/classes"/>
-        </copy>
-
-        <copy todir="${build.soapconfig}/services">
-            <fileset dir="${webmethods.dd.dir}" includes="javax.*"/>
-        </copy>
-        <jar file="${build.dir}/soapconfig.jar">
-             <metainf dir="${build.soapconfig}"/>
-        </jar>
-
-	      <copy todir="${webmethods.lib.dir}">
-            <fileset dir="${xtsinstalled.home}/lib" includes="*.jar"/>
-            <fileset dir="${xtsinstalled.home}/lib/ext" includes="${ext.package}"/>
-            <fileset dir="${build.dir}" includes="config.jar soapconfig.jar"/>
-	      </copy>
-
-        <copy todir="${webmethods.services.dir}">
-            <fileset dir="${webmethods.dd.dir}">
-                <include name="*AT.xml"/>
-                <include name="*BA.xml"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build" depends="jboss-ear, weblogic-ear, webmethods-app"/>
-
     <target name="docs" depends="init">
         <copy todir="${html.dir}">
             <fileset dir="${docs.dir}">
@@ -376,9 +260,6 @@
                 <include name="html/**"/>
                 <include name="dd/**"/>
                 <include name="web/**"/>
-                <include name="*.properties"/>
-                <include name="build.sh"/>
-                <include name="build.bat"/>
                 <include name="BUILDING"/>
             </fileset>
         </copy>
@@ -386,26 +267,12 @@
         <copy file="xts-build.xml" tofile="${selected-distrib-dir}/build.xml"/>
     </target>
 
-    <target name="deploy" depends="deploy-ears, deploy-exploded"/>
-
-    <target name="deploy-ears" depends="build, undeploy" unless="webmethods.home">
-        <copy file="${build.dir}/xts-demo.ear" tofile="${deploy.dir}/xts-demo.ear"/>
+    <target name="deploy">
+        <copy file="${build.dir}/xts-demo.ear" tofile="${jboss.deploy.dir}/xts-demo.ear"/>
     </target>
 
-    <target name="deploy-exploded" depends="build, undeploy" if="webmethods.home">
-        <mkdir dir="${webmethods.deploy.dir}"/>
-        <copy todir="${webmethods.deploy.dir}">
-             <fileset dir="${webmethods.build.dir}"/>
-        </copy>
+    <target name="undeploy">
+        <delete file="${jboss.deploy.dir}/xts-demo.ear"/>
     </target>
 
-    <target name="undeploy" depends="undeploy-ears, undeploy-exploded"/>
-
-    <target name="undeploy-ears" unless="webmethods.home">
-        <delete file="${deploy.dir}/xts-demo.ear"/>
-    </target>
-
-    <target name="undeploy-exploded" if="webmethods.home">
-        <delete dir="${webmethods.deploy.dir}"/>
-    </target>
 </project>

Modified: labs/jbosstm/trunk/XTS/demo/dd/jboss/application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/application.xml	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/application.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,59 +15,68 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
   MA  02110-1301, USA.
   
-  (C) 2005-2006,
+  (C) 2005-2007,
   @author JBoss Inc.
 -->
-
-<!-- $Id: axis-application.xml,v 1.8.4.1 2005/11/22 10:42:05 kconner Exp $ -->
-
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
-    <display-name>XML Transaction Service Demo</display-name>
-
-    <description>XML Transaction Service Demo</description>
-
-    <module>
-        <web>
-            <web-uri>ws-c.war</web-uri>
-            <context-root>/xts</context-root>
-        </web>
-    </module>
-    
-    <module>
-        <web>
-            <web-uri>ws-t.war</web-uri>
-            <context-root>/ws-t</context-root>
-        </web>
-    </module>
-
-    <module>
-        <web>
-            <web-uri>wscf.war</web-uri>
-            <context-root>/wscf</context-root>
-        </web>
-    </module>
-
-    <module>
-        <web>
-            <web-uri>wstx.war</web-uri>
-            <context-root>/wstx</context-root>
-        </web>
-    </module>
-
-    <module>
-        <web>
-            <web-uri>xts-demo-webservices.war</web-uri>
-            <context-root>/xtsdemowebservices</context-root>
-        </web>
-    </module>
-
-    <module>
-        <web>
-            <web-uri>xts-demo.war</web-uri>
-            <context-root>/xts-demo</context-root>
-        </web>
-    </module>
-
-</application>
+
+<!-- $Id: axis-application.xml,v 1.8.4.1 2005/11/22 10:42:05 kconner Exp $ -->
+
+<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+    <display-name>XML Transaction Service Demo</display-name>
+
+    <description>XML Transaction Service Demo</description>
+
+    <!--
+    <module>
+        <web>
+            <web-uri>ws-c.war</web-uri>
+            <context-root>/xts</context-root>
+        </web>
+    </module>
+    
+    <module>
+        <web>
+            <web-uri>ws-t.war</web-uri>
+            <context-root>/ws-t</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wscf.war</web-uri>
+            <context-root>/wscf</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>wstx.war</web-uri>
+            <context-root>/wstx</context-root>
+        </web>
+    </module>
+    -->
+    
+    <module>
+        <web>
+            <web-uri>xts-demo-jaxws-webservices.war</web-uri>
+            <context-root>/xtsdemojaxwswebservices</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>xts-demo-webservices.war</web-uri>
+            <context-root>/xtsdemowebservices</context-root>
+        </web>
+    </module>
+
+    <module>
+        <web>
+            <web-uri>xts-demo.war</web-uri>
+            <context-root>/xts-demo</context-root>
+        </web>
+    </module>
+
+</application>

Modified: labs/jbosstm/trunk/XTS/demo/dd/jboss/client-jaxrpc-mapping.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/client-jaxrpc-mapping.xml	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/client-jaxrpc-mapping.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -23,11 +23,8 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
 http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
 	version="1.1">
+
 	<package-mapping>
-		<package-type>com.arjuna.xts.nightout.clients.jboss.restaurant</package-type>
-		<namespaceURI>http://www.jboss.com/jbosstm/xts/demo/Restaurant</namespaceURI>
-	</package-mapping>
-	<package-mapping>
 		<package-type>com.arjuna.xts.nightout.clients.jboss.theatre</package-type>
 		<namespaceURI>http://www.jboss.com/jbosstm/xts/demo/Theatre</namespaceURI>
 	</package-mapping>

Modified: labs/jbosstm/trunk/XTS/demo/dd/jboss/client-web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/client-web-app.xml	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/client-web-app.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -30,14 +30,6 @@
         <servlet-name>Basic Client Servlet</servlet-name>
         <servlet-class>com.arjuna.xts.nightout.clients.jboss.BasicClient</servlet-class>
         <init-param>
-            <param-name>restaurantATURL</param-name>
-            <param-value>@restaurantATURL@</param-value>
-        </init-param>
-        <init-param>
-            <param-name>restaurantBAURL</param-name>
-            <param-value>@restaurantBAURL@</param-value>
-        </init-param>
-        <init-param>
             <param-name>taxiATURL</param-name>
             <param-value>@taxiATURL@</param-value>
         </init-param>
@@ -61,34 +53,6 @@
     </servlet-mapping>
     
     <service-ref>
-        <service-ref-name>service/RestaurantServiceAT</service-ref-name>
-        <service-interface>javax.xml.rpc.Service</service-interface>
-        <wsdl-file>WEB-INF/wsdl/RestaurantServiceAT.wsdl</wsdl-file>
-        <jaxrpc-mapping-file>WEB-INF/client-jaxrpc-mapping.xml</jaxrpc-mapping-file>
-        <service-qname xmlns:demo="http://www.jboss.com/jbosstm/xts/demo/Restaurant">demo:IRestaurantServiceService</service-qname>
-        <port-component-ref>
-            <service-endpoint-interface>com.arjuna.xts.nightout.clients.jboss.restaurant.IRestaurantServiceAT</service-endpoint-interface>
-        </port-component-ref>
-        <handler>
-            <handler-name>XTSClientHandler</handler-name>
-            <handler-class>com.arjuna.mw.wst.client.JaxRPCHeaderContextProcessor</handler-class>
-        </handler>
-    </service-ref>
-    <service-ref>
-        <service-ref-name>service/RestaurantServiceBA</service-ref-name>
-        <service-interface>javax.xml.rpc.Service</service-interface>
-        <wsdl-file>WEB-INF/wsdl/RestaurantServiceBA.wsdl</wsdl-file>
-        <jaxrpc-mapping-file>WEB-INF/client-jaxrpc-mapping.xml</jaxrpc-mapping-file>
-        <service-qname xmlns:demo="http://www.jboss.com/jbosstm/xts/demo/Restaurant">demo:IRestaurantServiceBAService</service-qname>
-        <port-component-ref>
-            <service-endpoint-interface>com.arjuna.xts.nightout.clients.jboss.restaurant.IRestaurantServiceBA</service-endpoint-interface>
-        </port-component-ref>
-        <handler>
-            <handler-name>XTSClientHandler</handler-name>
-            <handler-class>com.arjuna.mw.wst.client.JaxRPCHeaderContextProcessor</handler-class>
-        </handler>
-    </service-ref>
-    <service-ref>
         <service-ref-name>service/TaxiServiceAT</service-ref-name>
         <service-interface>javax.xml.rpc.Service</service-interface>
         <wsdl-file>WEB-INF/wsdl/TaxiServiceAT.wsdl</wsdl-file>

Modified: labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxrpc-mapping.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxrpc-mapping.xml	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxrpc-mapping.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -23,11 +23,8 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
 http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
 	version="1.1">
+
 	<package-mapping>
-		<package-type>com.arjuna.xts.nightout.services.Restaurant</package-type>
-		<namespaceURI>http://www.jboss.com/jbosstm/xts/demo/Restaurant</namespaceURI>
-	</package-mapping>
-	<package-mapping>
 		<package-type>com.arjuna.xts.nightout.services.Theatre</package-type>
 		<namespaceURI>http://www.jboss.com/jbosstm/xts/demo/Theatre</namespaceURI>
 	</package-mapping>

Added: labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxws-handlers-client.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxws-handlers-client.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxws-handlers-client.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -0,0 +1,37 @@
+<!--
+  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) 2007,
+  @author JBoss Inc.
+-->
+
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains 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 javaee_web_services_1_2.xsd">
+
+   <handler-chain>
+      <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
+
+      <handler>
+         <handler-name>ClientTxContextHandler</handler-name>
+         <handler-class>com.arjuna.mw.wst.client.JaxWSHeaderContextProcessor </handler-class>
+      </handler>
+
+   </handler-chain>
+</handler-chains>

Added: labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxws-handlers-server.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxws-handlers-server.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/jaxws-handlers-server.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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) 2007,
+  @author JBoss Inc.
+-->
+
+<handler-chains 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 javaee_web_services_1_2.xsd">
+
+	<handler-chain>
+		<protocol-bindings>##SOAP11_HTTP</protocol-bindings>
+
+		<handler>
+			<handler-name>WebServicesTxContextHandler</handler-name>
+			<handler-class>com.arjuna.mw.wst.service.JaxWSHeaderContextProcessor</handler-class>
+		</handler>
+
+	</handler-chain>
+</handler-chains>

Added: labs/jbosstm/trunk/XTS/demo/dd/jboss/service-jaxws-web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/service-jaxws-web-app.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/service-jaxws-web-app.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -0,0 +1,43 @@
+<!--
+  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) 2007,
+  @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">
+
+	<servlet>
+		<servlet-name>RestaurantServiceAT</servlet-name>
+		<servlet-class>com.arjuna.xts.nightout.services.Restaurant.RestaurantServiceAT</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>RestaurantServiceBA</servlet-name>
+		<servlet-class>com.arjuna.xts.nightout.services.Restaurant.RestaurantServiceBA</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>RestaurantServiceAT</servlet-name>
+		<url-pattern>/RestaurantServiceAT</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>RestaurantServiceBA</servlet-name>
+		<url-pattern>/RestaurantServiceBA</url-pattern>
+	</servlet-mapping>
+</web-app>

Modified: labs/jbosstm/trunk/XTS/demo/dd/jboss/service-web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/service-web-app.xml	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/service-web-app.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,7 +15,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
   MA  02110-1301, USA.
   
-  (C) 2005-2006,
+  (C) 2005-2007,
   @author JBoss Inc.
 -->
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
@@ -24,14 +24,6 @@
 	version="2.4">
 
 	<servlet>
-		<servlet-name>RestaurantServiceAT</servlet-name>
-		<servlet-class>com.arjuna.xts.nightout.services.Restaurant.RestaurantServiceAT</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>RestaurantServiceBA</servlet-name>
-		<servlet-class>com.arjuna.xts.nightout.services.Restaurant.RestaurantServiceBA</servlet-class>
-	</servlet>
-	<servlet>
 		<servlet-name>TheatreServiceAT</servlet-name>
 		<servlet-class>com.arjuna.xts.nightout.services.Theatre.TheatreServiceAT</servlet-class>
 	</servlet>
@@ -48,15 +40,8 @@
 		<servlet-class>com.arjuna.xts.nightout.services.Taxi.TaxiServiceBA</servlet-class>
 	</servlet>
 
+
 	<servlet-mapping>
-		<servlet-name>RestaurantServiceAT</servlet-name>
-		<url-pattern>/RestaurantServiceAT</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>RestaurantServiceBA</servlet-name>
-		<url-pattern>/RestaurantServiceBA</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
 		<servlet-name>TheatreServiceAT</servlet-name>
 		<url-pattern>/TheatreServiceAT</url-pattern>
 	</servlet-mapping>

Modified: labs/jbosstm/trunk/XTS/demo/dd/jboss/webservices.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/webservices.xml	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/webservices.xml	2007-11-22 12:02:13 UTC (rev 16748)
@@ -23,44 +23,6 @@
 	version="1.1">
 
 	<webservice-description>
-		<webservice-description-name>RestaurantServiceAT</webservice-description-name>
-
-		<wsdl-file>WEB-INF/wsdl/RestaurantServiceAT.wsdl</wsdl-file>
-
-		<jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-		<port-component>
-			<port-component-name>RestaurantServiceAT</port-component-name>
-			<wsdl-port xmlns:rest="http://www.jboss.com/jbosstm/xts/demo/Restaurant">rest:RestaurantServiceAT</wsdl-port>
-			<service-endpoint-interface>com.arjuna.xts.nightout.services.Restaurant.IRestaurantService</service-endpoint-interface>
-			<service-impl-bean>
-				<servlet-link>RestaurantServiceAT</servlet-link>
-			</service-impl-bean>
-			<handler>
-				<handler-name>serverHandler</handler-name>
-				<handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
-			</handler>
-		</port-component>
-	</webservice-description>
-	<webservice-description>
-		<webservice-description-name>RestaurantServiceBA</webservice-description-name>
-
-		<wsdl-file>WEB-INF/wsdl/RestaurantServiceBA.wsdl</wsdl-file>
-
-		<jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-		<port-component>
-			<port-component-name>RestaurantServiceBA</port-component-name>
-			<wsdl-port xmlns:rest="http://www.jboss.com/jbosstm/xts/demo/Restaurant">rest:RestaurantServiceBA</wsdl-port>
-			<service-endpoint-interface>com.arjuna.xts.nightout.services.Restaurant.IRestaurantServiceBA</service-endpoint-interface>
-			<service-impl-bean>
-				<servlet-link>RestaurantServiceBA</servlet-link>
-			</service-impl-bean>
-			<handler>
-				<handler-name>serverHandler</handler-name>
-				<handler-class>com.arjuna.mw.wst.service.JaxRPCHeaderContextProcessor</handler-class>
-			</handler>
-		</port-component>
-	</webservice-description>
-	<webservice-description>
 		<webservice-description-name>TheatreServiceAT</webservice-description-name>
 
 		<wsdl-file>WEB-INF/wsdl/TheatreServiceAT.wsdl</wsdl-file>

Deleted: labs/jbosstm/trunk/XTS/demo/dd/jboss/wsdl/RestaurantServiceAT.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/wsdl/RestaurantServiceAT.wsdl	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/wsdl/RestaurantServiceAT.wsdl	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,79 +0,0 @@
-<!--
-  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.
--->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:intf="http://www.jboss.com/jbosstm/xts/demo/Restaurant" xmlns:impl="http://www.jboss.com/jbosstm/xts/demo/Restaurant" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://www.jboss.com/jbosstm/xts/demo/Restaurant">
-
-   <wsdl:message name="bookSeatsRequest">
-
-      <wsdl:part name="in0" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="bookSeatsResponse">
-
-   </wsdl:message>
-
-   <wsdl:portType name="IRestaurantService">
-
-      <wsdl:operation name="bookSeats" parameterOrder="in0">
-
-         <wsdl:input name="bookSeatsRequest" message="intf:bookSeatsRequest"/>
-
-         <wsdl:output name="bookSeatsResponse" message="intf:bookSeatsResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="RestaurantServiceATSoapBinding" type="intf:IRestaurantService">
-
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="bookSeats">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="bookSeatsRequest">
-
-            <wsdlsoap:body use="literal" namespace="http://www.jboss.com/jbosstm/xts/demo/Restaurant"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="bookSeatsResponse">
-
-            <wsdlsoap:body use="literal" namespace="http://www.jboss.com/jbosstm/xts/demo/Restaurant"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="IRestaurantServiceService">
-
-      <wsdl:port name="RestaurantServiceAT" binding="intf:RestaurantServiceATSoapBinding">
-
-         <wsdlsoap:address location="http://localhost:8080/xtsdemowebservices/RestaurantServiceAT"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>

Deleted: labs/jbosstm/trunk/XTS/demo/dd/jboss/wsdl/RestaurantServiceBA.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/wsdl/RestaurantServiceBA.wsdl	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/wsdl/RestaurantServiceBA.wsdl	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,81 +0,0 @@
-<!--
-  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.
--->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:intf="http://www.jboss.com/jbosstm/xts/demo/Restaurant" xmlns:impl="http://www.jboss.com/jbosstm/xts/demo/Restaurant" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://www.jboss.com/jbosstm/xts/demo/Restaurant">
-
-   <wsdl:message name="bookSeatsBARequest">
-
-      <wsdl:part name="in0" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="bookSeatsBAResponse">
-
-      <wsdl:part name="bookSeatsBAResponse" type="xsd:boolean"/>
-
-   </wsdl:message>
-
-   <wsdl:portType name="IRestaurantServiceBA">
-
-      <wsdl:operation name="bookSeats" parameterOrder="in0">
-
-         <wsdl:input name="bookSeatsBARequest" message="intf:bookSeatsBARequest"/>
-
-         <wsdl:output name="bookSeatsBAResponse" message="intf:bookSeatsBAResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="RestaurantServiceBASoapBinding" type="intf:IRestaurantServiceBA">
-
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="bookSeats">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="bookSeatsBARequest">
-
-            <wsdlsoap:body use="literal" namespace="http://www.jboss.com/jbosstm/xts/demo/Restaurant"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="bookSeatsBAResponse">
-
-            <wsdlsoap:body use="literal" namespace="http://www.jboss.com/jbosstm/xts/demo/Restaurant"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="IRestaurantServiceBAService">
-
-      <wsdl:port name="RestaurantServiceBA" binding="intf:RestaurantServiceBASoapBinding">
-
-         <wsdlsoap:address location="http://localhost:8080/xtsdemowebservices/RestaurantServiceBA"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>

Deleted: labs/jbosstm/trunk/XTS/demo/jboss.properties
===================================================================
--- labs/jbosstm/trunk/XTS/demo/jboss.properties	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/jboss.properties	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,65 +0,0 @@
-<!--
-  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 property file
-  The following variables should be replaced for JBoss deployment
-  
-  JBOSS_HOSTNAME - the hostname of the JBoss installation (localhost)
-  JBOSS_PORT - the port of the JBoss web server (8080)
-  JBOSS_URLSTUB - the url stub for the demo webservices (xtsdemowebservices)
-  JBOSS_DEPLOY_DIR - the deploy directory of the JBoss instance ([JBOSS_HOME]/server/all/deploy)
-  
-  You can choose any combination of the URL entries provided that there is an entry for each service.
-  The default services are the ones running within JBoss.
--->
-<arjuna>
-  <hostname>JBOSS_HOSTNAME</hostname>
-  <port>JBOSS_PORT</port>
-  <urlstub>JBOSS_URLSTUB</urlstub>
-  <deploy>
-    <dir>JBOSS_DEPLOY_DIR</dir>
-  </deploy>
-
-  <!-- webMethods services
-  <restaurantATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/RestaurantServiceAT</restaurantATURL>
-  <restaurantBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/RestaurantServiceBA</restaurantBAURL>
-  <taxiATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TaxiServiceAT</taxiATURL>
-  <taxiBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TaxiServiceBA</taxiBAURL>
-  <theatreATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TheatreServiceAT</theatreATURL>
-  <theatreBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TheatreServiceBA</theatreBAURL>
-  -->
-
-  <!-- WebLogic services
-  <restaurantATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/RestaurantServiceAT</restaurantATURL>
-  <restaurantBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/RestaurantServiceBA</restaurantBAURL>
-  <taxiATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TaxiServiceAT</taxiATURL>
-  <taxiBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TaxiServiceBA</taxiBAURL>
-  <theatreATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TheatreServiceAT</theatreATURL>
-  <theatreBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TheatreServiceBA</theatreBAURL>
-  -->
-
-  <!-- JBoss services -->
-  <restaurantATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/RestaurantServiceAT</restaurantATURL>
-  <restaurantBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/RestaurantServiceBA</restaurantBAURL>
-  <taxiATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TaxiServiceAT</taxiATURL>
-  <taxiBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TaxiServiceBA</taxiBAURL>
-  <theatreATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TheatreServiceAT</theatreATURL>
-  <theatreBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TheatreServiceBA</theatreBAURL>
-</arjuna>

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/BasicClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/BasicClient.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/BasicClient.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,24 +1,24 @@
-/*
- * 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-2007,
+ * @author JBoss Inc.
+ */
+/*
  * BasicClient.java
  *
  * Copyright (c) 2003, 2004 Arjuna Technologies Ltd.
@@ -43,6 +43,15 @@
 import javax.xml.rpc.ServiceException;
 import javax.xml.rpc.Stub;
 
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.handler.Handler;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.arjuna.mw.wst.client.JaxWSHeaderContextProcessor;
 import com.arjuna.mw.wst.UserBusinessActivity;
 import com.arjuna.mw.wst.UserBusinessActivityFactory;
 import com.arjuna.mw.wst.UserTransaction;
@@ -98,7 +107,7 @@
      * The local context name for the BA Taxi webservice.
      */
     private static final String TAXI_SERVICE_BA = "java:comp/env/service/TaxiServiceBA" ;
-    
+
     /**
      * The atomic transaction restaurant stub.
      */
@@ -153,7 +162,7 @@
      * The initialised flag.
      */
     private boolean initialised ;
-    
+
     /**
      * Initialise the servlet.
      * @param servletConfig The servlet configuration.
@@ -161,15 +170,19 @@
     public void init(final ServletConfig config)
         throws ServletException
     {
-        final String baseURL = "http://localhost:8080/xtsdemowebservices/" ;
+	// Location of JAX-RPC Web services
+        final String jaxRPCBaseURL = "http://localhost:8080/xtsdemowebservices/" ;
+        
+	// Location of JAX-WS Web services
+	final String jaxWSBaseURL = "http://localhost:8080/xtsdemojaxwswebservices/" ;
+        
+        restaurantATURL = jaxWSBaseURL + "RestaurantServiceAT?wsdl" ;
+        restaurantBAURL = jaxWSBaseURL + "RestaurantServiceBA?wsdl" ;
+        taxiATURL = getURL(config, "taxiATURL", jaxRPCBaseURL + "TaxiServiceAT") ;
+        taxiBAURL = getURL(config, "taxiBAURL", jaxRPCBaseURL + "TaxiServiceBA") ;
+        theatreATURL = getURL(config, "theatreATURL", jaxRPCBaseURL + "TheatreServiceAT") ;
+        theatreBAURL = getURL(config, "theatreBAURL", jaxRPCBaseURL + "TheatreServiceBA") ;
 
-        restaurantATURL = getURL(config, "restaurantATURL", baseURL + "RestaurantServiceAT") ;
-        restaurantBAURL = getURL(config, "restaurantBAURL", baseURL + "RestaurantServiceBA") ;
-        taxiATURL = getURL(config, "taxiATURL", baseURL + "TaxiServiceAT") ;
-        taxiBAURL = getURL(config, "taxiBAURL", baseURL + "TaxiServiceBA") ;
-        theatreATURL = getURL(config, "theatreATURL", baseURL + "TheatreServiceAT") ;
-        theatreBAURL = getURL(config, "theatreBAURL", baseURL + "TheatreServiceBA") ;
-
         context = config.getServletContext();
     }
 
@@ -183,8 +196,11 @@
         {
             try
             {
-                restaurantAT = (IRestaurantServiceAT)getService(RESTAURANT_SERVICE_AT, restaurantATURL, IRestaurantServiceAT.class) ;
-                restaurantBA = (IRestaurantServiceBA)getService(RESTAURANT_SERVICE_BA, restaurantBAURL, IRestaurantServiceBA.class) ;
+                // JAX-WS
+                restaurantAT = getPortRestaurantServiceAT(restaurantATURL);
+                restaurantBA = getPortRestaurantServiceBA(restaurantBAURL);
+
+                // JAX-RPC
                 taxiAT = (ITaxiServiceAT)getService(TAXI_SERVICE_AT, taxiATURL, ITaxiServiceAT.class) ;
                 taxiBA = (ITaxiServiceBA)getService(TAXI_SERVICE_BA, taxiBAURL, ITaxiServiceBA.class) ;
                 theatreAT = (ITheatreServiceAT)getService(THEATRE_SERVICE_AT, theatreATURL, ITheatreServiceAT.class) ;
@@ -218,7 +234,7 @@
         int theatreSeats = Integer.parseInt(request.getParameter("theatrecount"));
         int theatreArea = Integer.parseInt(request.getParameter("theatrearea"));
         int taxiCount = Integer.parseInt(request.getParameter("taxi"));
-        boolean bookTaxi = (taxiCount >= 1 ? true : false);
+        boolean bookTaxi = (taxiCount >= 1);
 
         String result = "Transaction finished OK.";
         String txType = request.getParameter("txType");
@@ -350,16 +366,16 @@
      * @param config The servlet config
      * @param property The property name
      * @param defautlValue The default value.
-     * @return The initialisation property value or the default value if not present. 
+     * @return The initialisation property value or the default value if not present.
      */
     private String getURL(final ServletConfig config, final String property, final String defaultValue)
     {
         final String value = config.getInitParameter(property) ;
         return (value == null ? defaultValue : value) ;
     }
-    
+
     /**
-     * Get the service proxy for the specified service endpoing.
+     * Get the service proxy for the specified service endpoint.
      * @param jndiName The JNDI location of the service.
      * @param url The URL of the service.
      * @param portClass The port class type.
@@ -376,4 +392,38 @@
         stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, url) ;
         return stub ;
     }
+
+    private IRestaurantServiceAT getPortRestaurantServiceAT(String url)
+            throws MalformedURLException
+    {
+        URL wsdlLocation = new URL(url);
+        QName serviceName = new QName("http://www.jboss.com/jbosstm/xts/demo/Restaurant","RestaurantServiceAT");
+        javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlLocation, serviceName);
+        IRestaurantServiceAT port =  service.getPort(IRestaurantServiceAT.class);
+
+        // Insert client handler
+        BindingProvider bindingProvider = (BindingProvider)port;
+        List<Handler> handlerChain = new ArrayList<Handler>();
+        handlerChain.add(new JaxWSHeaderContextProcessor());
+        bindingProvider.getBinding().setHandlerChain(handlerChain);
+
+        return port;
+    }
+
+    private IRestaurantServiceBA getPortRestaurantServiceBA(String url)
+            throws MalformedURLException
+    {
+        URL wsdlLocation = new URL(url);
+        QName serviceName = new QName("http://www.jboss.com/jbosstm/xts/demo/Restaurant","RestaurantServiceBA");
+        javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlLocation, serviceName);
+        IRestaurantServiceBA port =  service.getPort(IRestaurantServiceBA.class);
+
+        // Insert client handler
+        BindingProvider bindingProvider = (BindingProvider)port;
+        List<Handler> handlerChain = new ArrayList<Handler>();
+        handlerChain.add(new JaxWSHeaderContextProcessor());
+        bindingProvider.getBinding().setHandlerChain(handlerChain);
+
+        return port;
+    }
 }

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/restaurant/IRestaurantServiceAT.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/restaurant/IRestaurantServiceAT.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/restaurant/IRestaurantServiceAT.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,14 +15,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
  * MA  02110-1301, USA.
  * 
- * (C) 2005-2006,
+ * (C) 2005-2007,
  * @author JBoss Inc.
  */
 package com.arjuna.xts.nightout.clients.jboss.restaurant ;
 
+import javax.jws.WebService;
 import java.rmi.Remote;
 import java.rmi.RemoteException ;
 
+ at WebService
 public interface IRestaurantServiceAT extends Remote
 {
 

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/restaurant/IRestaurantServiceBA.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/restaurant/IRestaurantServiceBA.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/clients/jboss/restaurant/IRestaurantServiceBA.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,14 +15,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
  * MA  02110-1301, USA.
  * 
- * (C) 2005-2006,
+ * (C) 2005-2007,
  * @author JBoss Inc.
  */
 package com.arjuna.xts.nightout.clients.jboss.restaurant ;
 
+import javax.jws.WebService;
 import java.rmi.Remote;
 import java.rmi.RemoteException ;
 
+ at WebService
 public interface IRestaurantServiceBA extends Remote
 {
 

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/IRestaurantService.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/IRestaurantService.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/IRestaurantService.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,11 +15,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
  * MA  02110-1301, USA.
  * 
- * (C) 2005-2006,
+ * (C) 2005-2007,
  * @author JBoss Inc.
  */
+
 package com.arjuna.xts.nightout.services.Restaurant;
 
+import javax.jws.WebService;
+
+
+ at WebService
 public interface IRestaurantService
 {
      /**

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/IRestaurantServiceBA.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/IRestaurantServiceBA.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/IRestaurantServiceBA.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,11 +15,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
  * MA  02110-1301, USA.
  * 
- * (C) 2005-2006,
+ * (C) 2005-2007,
  * @author JBoss Inc.
  */
 package com.arjuna.xts.nightout.services.Restaurant;
 
+import javax.jws.WebService;
+
+ at WebService
 public interface IRestaurantServiceBA
 {
      /**

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantManager.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantManager.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,24 +1,24 @@
-/*
- * 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-2007,
+ * @author JBoss Inc.
+ */
+/*
  * RestaurantManager.java
  *
  * Copyright (c) 2003 Arjuna Technologies Ltd.
@@ -59,7 +59,7 @@
     public void bookSeats(Object txID, int nSeats)
     {
         // locate any pre-existing request for the same transaction
-        Integer request = (Integer) unpreparedTransactions.get(txID);
+        Integer request = unpreparedTransactions.get(txID);
         if (request == null)
         {
             // this is the first request for this transaction
@@ -84,7 +84,7 @@
     public boolean prepareSeats(Object txID)
     {
         // ensure that we have seen this transaction before
-        Integer request = (Integer) unpreparedTransactions.get(txID);
+        Integer request = unpreparedTransactions.get(txID);
         if (request == null)
         {
             return false; // error: transaction not registered
@@ -161,7 +161,7 @@
         if (preparedTransactions.containsKey(txID))
         {
             // undo the prepare operations
-            Integer request = (Integer) preparedTransactions.remove(txID);
+            Integer request = preparedTransactions.remove(txID);
             nFreeSeats += request.intValue();
             nPreparedSeats -= request.intValue();
             nBookedSeats -= request.intValue();
@@ -170,7 +170,7 @@
         else if (unpreparedTransactions.containsKey(txID))
         {
             // undo the booking operations
-            Integer request = (Integer) unpreparedTransactions.remove(txID);
+            Integer request = unpreparedTransactions.remove(txID);
             nBookedSeats -= request.intValue();
             success = true;
         }
@@ -197,7 +197,7 @@
         if (preparedTransactions.containsKey(txID))
         {
             // complete the prepared transaction
-            Integer request = (Integer) preparedTransactions.remove(txID);
+            Integer request = preparedTransactions.remove(txID);
             nCommittedSeats += request.intValue();
             nPreparedSeats -= request.intValue();
             nBookedSeats -= request.intValue();
@@ -206,7 +206,7 @@
         else if (unpreparedTransactions.containsKey(txID))
         {
             // use one phase commit optimisation, skipping prepare
-            Integer request = (Integer) unpreparedTransactions.remove(txID);
+            Integer request = unpreparedTransactions.remove(txID);
             nCommittedSeats += request.intValue();
             nFreeSeats -= request.intValue();
             nBookedSeats -= request.intValue();
@@ -363,8 +363,8 @@
         nBookedSeats = 0;
         nPreparedSeats = 0;
         nCommittedSeats = 0;
-        preparedTransactions = new Hashtable();
-        unpreparedTransactions = new Hashtable();
+        preparedTransactions = new Hashtable<Object,Integer>();
+        unpreparedTransactions = new Hashtable<Object,Integer>();
         autoCommitMode = true;
         preparation = new Object();
         isPreparationWaiting = false;
@@ -442,12 +442,12 @@
     /**
      * The transactions we know about but which have not been prepared.
      */
-    private Hashtable unpreparedTransactions;
+    private Hashtable<Object,Integer> unpreparedTransactions;
 
     /**
      * The transactions we know about and are prepared to commit.
      */
-    private Hashtable preparedTransactions;
+    private Hashtable<Object,Integer> preparedTransactions;
 
     /**
      * The default initial capacity of each seating area.

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceAT.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceAT.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceAT.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,74 +15,81 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
  * MA  02110-1301, USA.
  * 
- * (C) 2005-2006,
+ * (C) 2005-2007,
  * @author JBoss Inc.
  */
-/*
- * RestaurantServiceAT.java
- *
- * Copyright (c) 2003, 2004 Arjuna Technologies Ltd
- *
- * $Id: RestaurantServiceAT.java,v 1.3 2004/12/01 16:26:44 kconner Exp $
- *
- */
-
-package com.arjuna.xts.nightout.services.Restaurant;
-
-import com.arjuna.mw.wst.UserTransactionFactory;
-import com.arjuna.mw.wst.TransactionManagerFactory;
-import com.arjuna.ats.arjuna.common.Uid;
-
-/**
- * An adapter class that exposes the RestaurantManager business API as a
- * transactional Web Service. Also logs events to a RestaurantView object.
- *
- * @author Jonathan Halliday (jonathan.halliday at arjuna.com)
- * @version $Revision: 1.3 $
- */
-public class RestaurantServiceAT implements IRestaurantService
-{
-    /**
-     * Book a number of seats in the restaurant
-     * Enrols a Participant if necessary, then passes
-     * the call through to the business logic.
-     *
-     * @param how_many The number of seats to book
-     */
-    public void bookSeats(int how_many)
-    {
-        RestaurantView restaurantView = RestaurantView.getSingletonInstance();
-        RestaurantManager restaurantManager = RestaurantManager.getSingletonInstance();
-
-        String transactionId = null;
-        try
-        {
-            // get the transaction context of this thread:
-            transactionId = UserTransactionFactory.userTransaction().toString();
-            System.out.println("RestaurantServiceAT transaction id =" + transactionId);
-
-            if (!restaurantManager.knowsAbout(transactionId))
-            {
-                System.out.println("RestaurantServiceAT - enrolling...");
-                // enlist the Participant for this service:
-                RestaurantParticipantAT restaurantParticipant = new RestaurantParticipantAT(transactionId);
-                TransactionManagerFactory.transactionManager().enlistForDurableTwoPhase(restaurantParticipant, new Uid().toString());
-            }
-        }
-        catch (Exception e)
-        {
-            System.err.println("bookSeats: Participant enrolment failed");
-            e.printStackTrace(System.err);
-            return;
-        }
-
-        restaurantView.addMessage("******************************");
-
-        restaurantView.addMessage("id:" + transactionId + ". Received a booking request for one table of " + how_many + " people");
-
-        restaurantManager.bookSeats(transactionId, how_many);
-
-        restaurantView.addMessage("Request complete\n");
-        restaurantView.updateFields();
-    }
+/*
+ * RestaurantServiceAT.java
+ *
+ * Copyright (c) 2003, 2004 Arjuna Technologies Ltd
+ *
+ * $Id: RestaurantServiceAT.java,v 1.3 2004/12/01 16:26:44 kconner Exp $
+ *
+ */
+
+package com.arjuna.xts.nightout.services.Restaurant;
+
+import com.arjuna.mw.wst.UserTransactionFactory;
+import com.arjuna.mw.wst.TransactionManagerFactory;
+import com.arjuna.ats.arjuna.common.Uid;
+
+import javax.jws.WebService;
+import javax.jws.HandlerChain;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * An adapter class that exposes the RestaurantManager business API as a
+ * transactional Web Service. Also logs events to a RestaurantView object.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at arjuna.com)
+ * @version $Revision: 1.6 $
+ */
+ at WebService(serviceName="RestaurantServiceAT",targetNamespace="http://www.jboss.com/jbosstm/xts/demo/Restaurant")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+ at HandlerChain(file = "jaxws-handlers-server.xml")
+public class RestaurantServiceAT implements IRestaurantService
+{
+    /**
+     * Book a number of seats in the restaurant
+     * Enrols a Participant if necessary, then passes
+     * the call through to the business logic.
+     *
+     * @param how_many The number of seats to book
+     */
+    public void bookSeats(int how_many)
+    {
+        RestaurantView restaurantView = RestaurantView.getSingletonInstance();
+        RestaurantManager restaurantManager = RestaurantManager.getSingletonInstance();
+
+        String transactionId = null;
+        try
+        {
+            // get the transaction context of this thread:
+            transactionId = UserTransactionFactory.userTransaction().toString();
+            System.out.println("RestaurantServiceAT transaction id =" + transactionId);
+
+            if (!restaurantManager.knowsAbout(transactionId))
+            {
+                System.out.println("RestaurantServiceAT - enrolling...");
+                // enlist the Participant for this service:
+                RestaurantParticipantAT restaurantParticipant = new RestaurantParticipantAT(transactionId);
+                TransactionManagerFactory.transactionManager().enlistForDurableTwoPhase(restaurantParticipant, new Uid().toString());
+            }
+        }
+        catch (Exception e)
+        {
+            System.err.println("bookSeats: Participant enrolment failed");
+            e.printStackTrace(System.err);
+            return;
+        }
+
+        restaurantView.addMessage("******************************");
+
+        restaurantView.addMessage("id:" + transactionId + ". Received a booking request for one table of " + how_many + " people");
+
+        restaurantManager.bookSeats(transactionId, how_many);
+
+        restaurantView.addMessage("Request complete\n");
+        restaurantView.updateFields();
+    }
 }

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceBA.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceBA.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceBA.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,123 +15,129 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
  * MA  02110-1301, USA.
  * 
- * (C) 2005-2006,
+ * (C) 2005-2007,
  * @author JBoss Inc.
  */
-/*
- * RestaurantServiceBA.java
- *
- * Copyright (c) 2004 Arjuna Technologies Ltd
- *
- * $Id: RestaurantServiceBA.java,v 1.5 2004/12/01 16:26:44 kconner Exp $
- *
- */
-
-package com.arjuna.xts.nightout.services.Restaurant;
-
-import com.arjuna.wst.*;
-import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.mw.wst.BusinessActivityManager;
-import com.arjuna.mw.wst.BusinessActivityManagerFactory;
-
-/**
- * An adapter class that exposes the RestaurantManager business API as a
- * transactional Web Service. Also logs events to a RestaurantView object.
- *
- * @author Jonathan Halliday (jonathan.halliday at arjuna.com)
- * @version $Revision: 1.5 $
- */
-public class RestaurantServiceBA implements IRestaurantServiceBA
-{
-    /**
-     * Book a number of seats in the restaurant
-     * Enrols a Participant if necessary and passes
-     * the call through to the business logic.
-     *
-     * @param how_many The number of seats to book.
-     * @return true on success, false otherwise.
-     */
-    public boolean bookSeats(int how_many)
-    {
-        RestaurantView restaurantView = RestaurantView.getSingletonInstance();
-        RestaurantManager restaurantManager = RestaurantManager.getSingletonInstance();
-
-        BusinessActivityManager activityManager = BusinessActivityManagerFactory.businessActivityManager();
-
-        // get the transaction context of this thread:
-        String transactionId = null;
-        try
-        {
-            transactionId = activityManager.currentTransaction().toString();
-        }
-        catch (SystemException e)
-        {
-            System.err.println("bookSeats: unable to obtain a transaction context!");
-            e.printStackTrace(System.err);
-            return false;
-        }
-
-        // log the event:
-        System.out.println("RestaurantServiceBA transaction id =" + transactionId);
-
-        restaurantView.addMessage("******************************");
-
-        restaurantView.addPrepareMessage("id:" + transactionId + ". Received a booking request for one table of " + how_many + " people");
-        restaurantView.updateFields();
-
-        // invoke the backend business logic:
-        restaurantManager.bookSeats(transactionId, how_many);
-
-        // attempt to finalise the booking
-        // (it will be compensated later if necessary)
-        if (restaurantManager.prepareSeats(transactionId))
-        {
-            restaurantView.addMessage("id:" + transactionId + ". Seats prepared, trying to commit and enlist compensation Participant");
-            restaurantView.updateFields();
-
-            // it worked, so now we need a participant enlisted in case of compensation:
-
-            RestaurantParticipantBA restaurantParticipant = new RestaurantParticipantBA(transactionId, how_many);
-            // enlist the Participant for this service:
-            BAParticipantManager participantManager = null;
-            try
-            {
-                participantManager = activityManager.enlistForBusinessAgreementWithParticipantCompletion(restaurantParticipant, new Uid().toString());
-            }
-            catch (Exception e)
-            {
-                restaurantView.addMessage("id:" + transactionId + ". Participant enrolement failed");
-                System.err.println("bookSeats: Participant enlistment failed");
-                e.printStackTrace(System.err);
-                return false;
-            }
-
-            // finish the booking in the backend:
-            restaurantManager.commitSeats(transactionId);
-
-            try
-            {
-                // tell the manager we have finished our work:
-                participantManager.completed();
-            }
-            catch (Exception e)
-            {
-                System.err.println("bookSeats: 'completed' callback failed");
-                e.printStackTrace(System.err);
-                return false;
-            }
-        }
-        else
-        {
-            restaurantView.addMessage("id:" + transactionId + ". Failed to reserve seats. Cancelling.");
-            restaurantManager.cancelSeats(transactionId);
-            restaurantView.updateFields();
-            return false;
-        }
-
-        restaurantView.addMessage("Request complete\n");
-        restaurantView.updateFields();
-
-        return true;
-    }
+/*
+ * RestaurantServiceBA.java
+ *
+ * Copyright (c) 2004 Arjuna Technologies Ltd
+ *
+ * $Id: RestaurantServiceBA.java,v 1.5 2004/12/01 16:26:44 kconner Exp $
+ *
+ */
+
+package com.arjuna.xts.nightout.services.Restaurant;
+
+import com.arjuna.wst.*;
+import com.arjuna.ats.arjuna.common.Uid;
+import com.arjuna.mw.wst.BusinessActivityManager;
+import com.arjuna.mw.wst.BusinessActivityManagerFactory;
+
+import javax.jws.WebService;
+import javax.jws.HandlerChain;
+import javax.jws.soap.SOAPBinding;
+/**
+ * An adapter class that exposes the RestaurantManager business API as a
+ * transactional Web Service. Also logs events to a RestaurantView object.
+ *
+ * @author Jonathan Halliday (jonathan.halliday at arjuna.com)
+ * @version $Revision: 1.6 $
+ */
+ at WebService(serviceName="RestaurantServiceBA",targetNamespace="http://www.jboss.com/jbosstm/xts/demo/Restaurant")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+ at HandlerChain(file = "jaxws-handlers-server.xml")
+public class RestaurantServiceBA implements IRestaurantServiceBA
+{
+    /**
+     * Book a number of seats in the restaurant
+     * Enrols a Participant if necessary and passes
+     * the call through to the business logic.
+     *
+     * @param how_many The number of seats to book.
+     * @return true on success, false otherwise.
+     */
+    public boolean bookSeats(int how_many)
+    {
+        RestaurantView restaurantView = RestaurantView.getSingletonInstance();
+        RestaurantManager restaurantManager = RestaurantManager.getSingletonInstance();
+
+        BusinessActivityManager activityManager = BusinessActivityManagerFactory.businessActivityManager();
+
+        // get the transaction context of this thread:
+        String transactionId = null;
+        try
+        {
+            transactionId = activityManager.currentTransaction().toString();
+        }
+        catch (SystemException e)
+        {
+            System.err.println("bookSeats: unable to obtain a transaction context!");
+            e.printStackTrace(System.err);
+            return false;
+        }
+
+        // log the event:
+        System.out.println("RestaurantServiceBA transaction id =" + transactionId);
+
+        restaurantView.addMessage("******************************");
+
+        restaurantView.addPrepareMessage("id:" + transactionId + ". Received a booking request for one table of " + how_many + " people");
+        restaurantView.updateFields();
+
+        // invoke the backend business logic:
+        restaurantManager.bookSeats(transactionId, how_many);
+
+        // attempt to finalise the booking
+        // (it will be compensated later if necessary)
+        if (restaurantManager.prepareSeats(transactionId))
+        {
+            restaurantView.addMessage("id:" + transactionId + ". Seats prepared, trying to commit and enlist compensation Participant");
+            restaurantView.updateFields();
+
+            // it worked, so now we need a participant enlisted in case of compensation:
+
+            RestaurantParticipantBA restaurantParticipant = new RestaurantParticipantBA(transactionId, how_many);
+            // enlist the Participant for this service:
+            BAParticipantManager participantManager = null;
+            try
+            {
+                participantManager = activityManager.enlistForBusinessAgreementWithParticipantCompletion(restaurantParticipant, new Uid().toString());
+            }
+            catch (Exception e)
+            {
+                restaurantView.addMessage("id:" + transactionId + ". Participant enrolement failed");
+                System.err.println("bookSeats: Participant enlistment failed");
+                e.printStackTrace(System.err);
+                return false;
+            }
+
+            // finish the booking in the backend:
+            restaurantManager.commitSeats(transactionId);
+
+            try
+            {
+                // tell the manager we have finished our work:
+                participantManager.completed();
+            }
+            catch (Exception e)
+            {
+                System.err.println("bookSeats: 'completed' callback failed");
+                e.printStackTrace(System.err);
+                return false;
+            }
+        }
+        else
+        {
+            restaurantView.addMessage("id:" + transactionId + ". Failed to reserve seats. Cancelling.");
+            restaurantManager.cancelSeats(transactionId);
+            restaurantView.updateFields();
+            return false;
+        }
+
+        restaurantView.addMessage("Request complete\n");
+        restaurantView.updateFields();
+
+        return true;
+    }
 }

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantView.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantView.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Restaurant/RestaurantView.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,24 +1,24 @@
-/*
- * 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.
+ */
+/*
  * RestaurantView.java
  *
  * Copyright (c) 2003 Arjuna Technologies Ltd.
@@ -415,7 +415,7 @@
             singletonInstance = new RestaurantView(RestaurantManager.getSingletonInstance());
         }
 
-        singletonInstance.show();
+        singletonInstance.setVisible(true);
         return singletonInstance;
     }
 

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiManager.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiManager.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
  * MA  02110-1301, USA.
  * 
- * (C) 2005-2006,
+ * (C) 2005-2007,
  * @author JBoss Inc.
  */
 /*
@@ -58,7 +58,7 @@
     public void bookTaxi(Object txID)
     {
         // locate any pre-existing request for the same transaction
-        Integer request = (Integer) unpreparedTransactions.get(txID);
+        Integer request = unpreparedTransactions.get(txID);
         if (request == null)
         {
             // this is the first request for this
@@ -79,7 +79,7 @@
     public boolean prepareTaxi(Object txID)
     {
         // ensure that we have seen this transaction before
-        Integer request = (Integer) unpreparedTransactions.get(txID);
+        Integer request = unpreparedTransactions.get(txID);
         if (request == null)
         {
             return false; // error: transaction not registered
@@ -311,12 +311,12 @@
     /**
      * The transactions we know about but which have not been prepared.
      */
-    private Hashtable unpreparedTransactions;
+    private Hashtable<Object,Integer> unpreparedTransactions;
 
     /**
      * The transactions we know about and are prepared to commit.
      */
-    private Hashtable preparedTransactions;
+    private Hashtable<Object,Integer> preparedTransactions;
 
     /**
      * The auto commit mode.

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiServiceAT.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiServiceAT.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiServiceAT.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -76,7 +76,7 @@
 
         taxiView.addMessage("******************************");
 
-        taxiView.addMessage("id:" + transactionId.toString() + ". Received a taxi booking request");
+        taxiView.addMessage("id:" + transactionId + ". Received a taxi booking request");
 
         TaxiManager.getSingletonInstance().bookTaxi(transactionId);
 

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiServiceBA.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiServiceBA.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiServiceBA.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -75,7 +75,7 @@
 
         taxiView.addMessage("******************************");
 
-        taxiView.addPrepareMessage("id:" + transactionId.toString() + ". Received a taxi booking request");
+        taxiView.addPrepareMessage("id:" + transactionId + ". Received a taxi booking request");
         taxiView.updateFields();
 
         // invoke the backend business logic:

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiView.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiView.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Taxi/TaxiView.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -284,7 +284,7 @@
         {
             singletonInstance = new TaxiView(TaxiManager.getSingletonInstance());
         }
-        singletonInstance.show();
+        singletonInstance.setVisible(true);
         return singletonInstance;
     }
 

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreManager.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreManager.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
  * MA  02110-1301, USA.
  * 
- * (C) 2005-2006,
+ * (C) 2005-2007,
  * @author JBoss Inc.
  */
 /*
@@ -60,7 +60,7 @@
     public void bookSeats(Object txID, int nSeats, int area)
     {
         // locate any pre-existing request for the same transaction
-        Integer[] requests = (Integer[]) unpreparedTransactions.get(txID);
+        Integer[] requests = unpreparedTransactions.get(txID);
         if (requests == null)
         {
             // this is the first request for this transaction
@@ -91,7 +91,7 @@
         int[] nSeats = new int[NUM_SEAT_AREAS];
 
         // ensure that we have seen this transaction before
-        Integer[] requests = (Integer[]) unpreparedTransactions.get(txID);
+        Integer[] requests = unpreparedTransactions.get(txID);
         if (requests == null)
         {
             return false; // error: transaction not registered
@@ -184,7 +184,7 @@
         if (preparedTransactions.containsKey(txID))
         {
             // undo the prepare operations
-            Integer[] requests = (Integer[]) preparedTransactions.remove(txID);
+            Integer[] requests = preparedTransactions.remove(txID);
             for (int i = 0; i < NUM_SEAT_AREAS; i++)
             {
                 nFreeSeats[i] += requests[i].intValue();
@@ -196,7 +196,7 @@
         else if (unpreparedTransactions.containsKey(txID))
         {
             // undo the booking operations
-            Integer[] requests = (Integer[]) unpreparedTransactions.remove(txID);
+            Integer[] requests = unpreparedTransactions.remove(txID);
             for (int i = 0; i < NUM_SEAT_AREAS; i++)
             {
                 nBookedSeats[i] -= requests[i].intValue();
@@ -227,7 +227,7 @@
         {
 
             // complete the prepared transaction
-            Integer[] requests = (Integer[]) preparedTransactions.remove(txID);
+            Integer[] requests = preparedTransactions.remove(txID);
             for (int i = 0; i < NUM_SEAT_AREAS; i++)
             {
                 nCommittedSeats[i] += requests[i].intValue();
@@ -239,7 +239,7 @@
         else if (unpreparedTransactions.containsKey(txID))
         {
             // use one phase commit optimisation, skipping prepare
-            Integer[] requests = (Integer[]) unpreparedTransactions.remove(txID);
+            Integer[] requests = unpreparedTransactions.remove(txID);
             for (int i = 0; i < NUM_SEAT_AREAS; i++)
             {
                 nCommittedSeats[i] += requests[i].intValue();
@@ -495,12 +495,12 @@
     /**
      * The transactions we know about but which have not been prepared.
      */
-    private Hashtable unpreparedTransactions;
+    private Hashtable<Object,Integer[]> unpreparedTransactions;
 
     /**
      * The transactions we know about and are prepared to commit.
      */
-    private Hashtable preparedTransactions;
+    private Hashtable<Object,Integer[]> preparedTransactions;
 
     /**
      * Constant (array index) used for the seating area CIRCLE.

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreServiceAT.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreServiceAT.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreServiceAT.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -78,7 +78,7 @@
 
         theatreView.addMessage("******************************");
 
-        theatreView.addMessage("id:" + transactionId.toString() + ". Received a theatre booking request for " + how_many + " seats in area " + which_area);
+        theatreView.addMessage("id:" + transactionId + ". Received a theatre booking request for " + how_many + " seats in area " + which_area);
 
         TheatreManager.getSingletonInstance().bookSeats(transactionId, how_many, which_area);
 

Modified: labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreView.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreView.java	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/src/com/arjuna/xts/nightout/services/Theatre/TheatreView.java	2007-11-22 12:02:13 UTC (rev 16748)
@@ -541,7 +541,7 @@
             singletonInstance = new TheatreView(TheatreManager.getSingletonInstance());
         }
 
-        singletonInstance.show();
+        singletonInstance.setVisible(true);
         return singletonInstance;
     }
 

Added: labs/jbosstm/trunk/XTS/demo/web/images/jboss.gif
===================================================================
(Binary files differ)


Property changes on: labs/jbosstm/trunk/XTS/demo/web/images/jboss.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosstm/trunk/XTS/demo/web/index.jsp
===================================================================
--- labs/jbosstm/trunk/XTS/demo/web/index.jsp	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/web/index.jsp	2007-11-22 12:02:13 UTC (rev 16748)
@@ -17,7 +17,7 @@
   <tr>
     <td width="20">&nbsp;</td>
     <td align="center" width="170" bgcolor="#ffffff">
-      <img src="images/JBoss_DivOfRH_RGB.gif" alt="arjuna logo" border="0">
+      <img src="images/jboss.gif" alt="jboss logo" border="0">
     </td>
     <td width="20">&nbsp;</td>
     <td valign="middle" align="left" width="530" bgcolor="#ffffff">
@@ -93,7 +93,7 @@
 <TD colspan="3" height="20" bgcolor="#ffffff">&nbsp;</TD>
 </TR>
 <TR>
-<TD valign="top" align="left" width="10" bgcolor="#336699"><IMG src="images/tl_corner_10.gif" alt="" border="0"></TD><TD valign="middle" align="left" width="510" bgcolor="#336699"><FONT size="2" color="#ffffff" style="font-family: Arial, Helvetica, sans-serif"><B>Restaurant Service - Booking Form</B></FONT></TD><TD valign="top" align="right" width="10" bgcolor="#336699"><IMG src="images/tr_corner_10.gif" alt="" border="0"></TD>
+<TD valign="top" align="left" width="10" bgcolor="#336699"><IMG src="images/tl_corner_10.gif" alt="" border="0"></TD><TD valign="middle" align="left" width="510" bgcolor="#336699"><FONT size="2" color="#ffffff" style="font-family: Arial, Helvetica, sans-serif"><B>Transaction type</B></FONT></TD><TD valign="top" align="right" width="10" bgcolor="#336699"><IMG src="images/tr_corner_10.gif" alt="" border="0"></TD>
 </TR>
 <TR>
 <TD width="10" bgcolor="#e3e3e3">&nbsp;</TD><TD width="510" bgcolor="#e3e3e3">

Deleted: labs/jbosstm/trunk/XTS/demo/weblogic.properties
===================================================================
--- labs/jbosstm/trunk/XTS/demo/weblogic.properties	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/weblogic.properties	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,69 +0,0 @@
-<!--
-  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.
--->
-<!-- WebLogic property file
-  The following variables should be replaced for WebLogic deployment
-  
-  WEBLOGIC_HOSTNAME - the hostname of the WebLogic installation (localhost)
-  WEBLOGIC_PORT - the port of the WebLogic web server (7001)
-  WEBLOGIC_URLSTUB - the url stub for the demo webservices (xtsdemowebservices)
-  WEBLOGIC_DEPLOY_DIR - the deploy directory of the WebLogic instance
-  WEBLOGIC_HOME - The home directory of the WebLogic installation (/usr/local/bea/weblogic81)
-  
-  You can choose any combination of the URL entries provided that there is an entry for each service.
-  The default services are the ones running within WebLogic.
--->
-<arjuna>
-  <hostname>WEBLOGIC_HOSTNAME</hostname>
-  <port>WEBLOGIC_PORT</port>
-  <urlstub>WEBLOGIC_URLSTUB</urlstub>
-  <deploy>
-    <dir>WEBLOGIC_DEPLOY_DIR</dir>
-  </deploy>
-  <weblogic>
-    <home>WEBLOGIC_HOME</home>
-  </weblogic>
-
-  <!-- webMethods services
-  <restaurantATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/RestaurantServiceAT.wsdl</restaurantATURL>
-  <restaurantBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/RestaurantServiceBA.wsdl</restaurantBAURL>
-  <taxiATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TaxiServiceAT.wsdl</taxiATURL>
-  <taxiBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TaxiServiceBA.wsdl</taxiBAURL>
-  <theatreATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TheatreServiceAT.wsdl</theatreATURL>
-  <theatreBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TheatreServiceBA.wsdl</theatreBAURL>
-  -->
-
-  <!-- WebLogic services -->
-  <restaurantATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/RestaurantServiceAT?WSDL</restaurantATURL>
-  <restaurantBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/RestaurantServiceBA?WSDL</restaurantBAURL>
-  <taxiATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TaxiServiceAT?WSDL</taxiATURL>
-  <taxiBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TaxiServiceBA?WSDL</taxiBAURL>
-  <theatreATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TheatreServiceAT?WSDL</theatreATURL>
-  <theatreBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TheatreServiceBA?WSDL</theatreBAURL>
-
-  <!-- JBoss services
-  <restaurantATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/RestaurantServiceAT?wsdl</restaurantATURL>
-  <restaurantBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/RestaurantServiceBA?wsdl</restaurantBAURL>
-  <taxiATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TaxiServiceAT?wsdl</taxiATURL>
-  <taxiBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TaxiServiceBA?wsdl</taxiBAURL>
-  <theatreATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TheatreServiceAT?wsdl</theatreATURL>
-  <theatreBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TheatreServiceBA?wsdl</theatreBAURL>
-  -->
-</arjuna>

Deleted: labs/jbosstm/trunk/XTS/demo/webmethods.properties
===================================================================
--- labs/jbosstm/trunk/XTS/demo/webmethods.properties	2007-11-22 11:55:21 UTC (rev 16747)
+++ labs/jbosstm/trunk/XTS/demo/webmethods.properties	2007-11-22 12:02:13 UTC (rev 16748)
@@ -1,69 +0,0 @@
-<!--
-  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.
--->
-<!-- Webmethod property file
-  The following variables should be replaced for webMethods deployment
-  
-  WEBMETHODS_HOSTNAME - the hostname of the webMethods installation (localhost)
-  WEBMETHODS_PORT - the port of the webMethods web server (8004)
-  WEBMETHODS_URLSTUB - the url stub for the demo webservices (xts-demo)
-  WEBMETHODS_DEPLOY_DIR - the deploy directory of the webMethods instance
-  WEBMETHODS_HOME - The home directory of the webMethods installation (/usr/local/glue)
-  
-  You can choose any combination of the URL entries provided that there is an entry for each service.
-  The default services are the ones running within webMethods.
--->
-<arjuna>
-  <hostname>WEBMETHODS_HOSTNAME</hostname>
-  <port>WEBMETHODS_PORT</port>
-  <urlstub>WEBMETHODS_URLSTUB</urlstub>
-  <deploy>
-    <dir>WEBMETHODS_DEPLOY_DIR</dir>
-  </deploy>
-  <webmethods>
-    <home>WEBMETHODS_HOME</home>
-  </webmethods>
-
-  <!-- webmethods services -->
-  <restaurantATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/RestaurantServiceAT.wsdl</restaurantATURL>
-  <restaurantBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/RestaurantServiceBA.wsdl</restaurantBAURL>
-  <taxiATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TaxiServiceAT.wsdl</taxiATURL>
-  <taxiBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TaxiServiceBA.wsdl</taxiBAURL>
-  <theatreATURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TheatreServiceAT.wsdl</theatreATURL>
-  <theatreBAURL>http://WEBMETHODS_HOSTNAME:WEBMETHODS_PORT/WEBMETHODS_URLSTUB/services/TheatreServiceBA.wsdl</theatreBAURL>
-
-  <!-- WebLogic services
-  <restaurantATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/RestaurantServiceAT?WSDL</restaurantATURL>
-  <restaurantBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/RestaurantServiceBA?WSDL</restaurantBAURL>
-  <taxiATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TaxiServiceAT?WSDL</taxiATURL>
-  <taxiBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TaxiServiceBA?WSDL</taxiBAURL>
-  <theatreATURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TheatreServiceAT?WSDL</theatreATURL>
-  <theatreBAURL>http://WEBLOGIC_HOSTNAME:WEBLOGIC_PORT/WEBLOGIC_URLSTUB/TheatreServiceBA?WSDL</theatreBAURL>
-  -->
-
-  <!-- JBoss services
-  <restaurantATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/RestaurantServiceAT?wsdl</restaurantATURL>
-  <restaurantBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/RestaurantServiceBA?wsdl</restaurantBAURL>
-  <taxiATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TaxiServiceAT?wsdl</taxiATURL>
-  <taxiBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TaxiServiceBA?wsdl</taxiBAURL>
-  <theatreATURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TheatreServiceAT?wsdl</theatreATURL>
-  <theatreBAURL>http://JBOSS_HOSTNAME:JBOSS_PORT/JBOSS_URLSTUB/TheatreServiceBA?wsdl</theatreBAURL>
-  -->
-</arjuna>




More information about the jboss-svn-commits mailing list