[jboss-svn-commits] JBL Code SVN: r37510 - in labs/jbosstm/trunk/XTS/demo: srcrpc/com/arjuna/xts/nightout/services/Restaurant and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: paul.robinson
Date: 2011-10-06 09:38:31 -0400 (Thu, 06 Oct 2011)
New Revision: 37510

Modified:
   labs/jbosstm/trunk/XTS/demo/BUILDING
   labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceBA.java
   labs/jbosstm/trunk/XTS/demo/xts-build.xml
Log:
JBTM-911

Modified: labs/jbosstm/trunk/XTS/demo/BUILDING
===================================================================
--- labs/jbosstm/trunk/XTS/demo/BUILDING	2011-10-06 13:38:16 UTC (rev 37509)
+++ labs/jbosstm/trunk/XTS/demo/BUILDING	2011-10-06 13:38:31 UTC (rev 37510)
@@ -18,15 +18,22 @@
 # @author JBoss Inc.
 #
 
-This demo has been written for, and tested on, JBoss5.0.CR1.
-Please download and install one of these app servers from the
-JBoss website.
+This demo has been written for, and tested on, JBoss 7.0.2. It may work with other versions of JBoss 7.
+Please download and install this app server from the JBoss website.
 
+ensure JBoss AS is started with XTS enabled. This can be done by specifying the standalone-xts configuration when starting JBoss AS:
+
+cd $JBOSS_HOME
+sh bin/standalone.sh -server-config=standalone-xts.xml -Djava.awt.headless=false
+
+Note: The java.awt.headless property is needed for the demo as it starts a Java Swing user interface for each or the participant services. This is done for demonstration purposes; it is unlikely that a typical JEE application will ever do this. 
+
+
 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
  - set environment variable JBOSS_HOME to point to the root directory of an
-   instance of JBoss5.0.0.CR1
+   instance of JBoss 7
  - execute 'sh build.sh jboss clean deploy' on unix or
    'build.bat jboss clean deploy' on windows
 
@@ -36,7 +43,3 @@
 of JaxWS by supplying the argument 'deployrpc' in place of 'deploy' on
 the 'execute' command line detailed above.
 
-n.b. deployment of the demo to JbossAS 5.0.CR1 assumes that the XTS
-has already been deployed as a service archive (sar). See the INSTALL
-file in your ArjunaJTA or ArjunaJTS install tree for instructions on how
-to perform this deployment.

Modified: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceBA.java
===================================================================
--- labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceBA.java	2011-10-06 13:38:16 UTC (rev 37509)
+++ labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/xts/nightout/services/Restaurant/RestaurantServiceBA.java	2011-10-06 13:38:31 UTC (rev 37510)
@@ -31,8 +31,8 @@
 
 import com.arjuna.wst.*;
 import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.mw.wst.BusinessActivityManager;
-import com.arjuna.mw.wst.BusinessActivityManagerFactory;
+import com.arjuna.mw.wst11.BusinessActivityManager;
+import com.arjuna.mw.wst11.BusinessActivityManagerFactory;
 
 /**
  * An adapter class that exposes the RestaurantManager business API as a

Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml	2011-10-06 13:38:16 UTC (rev 37509)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml	2011-10-06 13:38:31 UTC (rev 37510)
@@ -49,7 +49,7 @@
 
     <!--    deploy.dir The deployment directory for the ear                 -->
 
-    <property name="deploy.dir" location="${jboss.home}/standalone/deploy"/>
+    <property name="deploy.dir" location="${jboss.home}/standalone/deployments"/>
 
     <!--  default target build will build an ear file for the demo app for  -->
     <!--  use in a JBoss AS7 server with XTS enabled                        -->
@@ -85,7 +85,7 @@
         <fileset dir="${lib.dir}" includes="${lib.libs}"/>
     </path>
     <path id="ext.path">
-        <fileset dir="${jboss.home}/modules/org/jboss/jts/main/" includes="narayana-jts-*.jar"/>
+        <fileset dir="${jboss.home}/modules/org/jboss/jts/main/" includes="jbossjts-*.jar"/>
     </path>
 
     <path id="jboss.client.path">