[jboss-svn-commits] JBL Code SVN: r37512 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge: demo and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 6 09:50:39 EDT 2011
Author: paul.robinson
Date: 2011-10-06 09:50:38 -0400 (Thu, 06 Oct 2011)
New Revision: 37512
Modified:
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/README.txt
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/build.xml
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/dd/persistence.xml
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/client/BasicClient.java
Log:
JBTM-888
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/README.txt
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/README.txt 2011-10-06 13:43:32 UTC (rev 37511)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/README.txt 2011-10-06 13:50:38 UTC (rev 37512)
@@ -9,19 +9,17 @@
A word on version compatibility:
--------------------------------
-This version, like the JBossTS it is bundled with, targets JBossAS 6 It probably will not work on earlier releases.
+This version, like the JBossTS it is bundled with, targets JBossAS 7. It probably will not work on earlier releases.
Ideally the txbridge should be used in conjunction with the JBossTS release it is included in, although it may
work with JBossTS 4.13.1 or later. This version won't work on any earlier release of JBossTS.
Building:
---------
+Build the bridge:
ant
-ensure XTS is deployed into the chosen server (see JBossAS docs/examples/transactions)
-set jbossas.home and jbossas.server in build.xml
-ant deploy
-for the demo app, assuming the above steps are complete first:
+Build and deploy the demo:
cd demo
set jbossas.home and jbossas.server in build.xml
@@ -29,9 +27,18 @@
ant deploy-service
ant deploy-client
+Start JBoss AS:
+---------------
+
+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
+./bin/standalone.sh --server-config=standalone-xts.xml
+
+
See docs/TransactionBridgingGuide for further details on the demo app.
Testing:
--------
-See docs/TransactionBridgingGuide - test framework section in the design notes appendix.
\ No newline at end of file
+See docs/TransactionBridgingGuide - test framework section in the design notes appendix.
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml 2011-10-06 13:43:32 UTC (rev 37511)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml 2011-10-06 13:50:38 UTC (rev 37512)
@@ -126,13 +126,13 @@
<property name="jbossas.home" location="/home/jhalli/IdeaProjects/jboss/jbossas_trunk/build/target/jboss-6.0.0-SNAPSHOT"/>
<property name="jbossas.server" value="default"/>
+ <!-- the following targets are utility functions for the JBossTS dev team.
+ You probably don't need to worry about them. -->
+
<target name="deploy" depends="dist" description="deploy to JBossAS">
- <copy file="${build}/txbridge.jar" todir="${jbossas.home}/server/${jbossas.server}/deploy/"/>
+ <copy file="${build}/txbridge.jar" todir="${jbossas.home}/modules/org/jboss/xts/main/"/>
</target>
- <!-- the following targets are utility functions for the JBossTS dev team.
- You probably don't need to worry about them. -->
-
<target name="install-jts">
<copy todir="${jbossas.home}/common/lib">
<fileset dir="${jbossts.home}/install/lib" includes="*.jar"/>
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/build.xml 2011-10-06 13:43:32 UTC (rev 37511)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/build.xml 2011-10-06 13:50:38 UTC (rev 37512)
@@ -79,30 +79,36 @@
<fileset dir="${build}/classes">
<include name="org/jboss/jbossts/txbridge/demo/bistro/*"/>
</fileset>
+ <manifest>
+ <!--attribute name="Dependencies" value="org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.dom4j,org.junit,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export,com.sun.xml.bind services export"/-->
+ <attribute name="Dependencies" value="org.jboss.xts,org.jboss.jts"/>
+ </manifest>
</jar>
<copy file="${dd}/jaxws-handlers-client.xml" todir="${build}/classes/org/jboss/jbossts/txbridge/demo/client"/>
<war warfile="${build}/txbridge-demo-client.war" webxml="${dd}/web.xml">
- <classes dir="${build}/classes">
- <include name="org/jboss/jbossts/txbridge/demo/client/*"/>
- </classes>
- <!-- jsp files -->
- <fileset dir="${web}" includes="*.jsp"/>
- </war>
-
+ <classes dir="${build}/classes">
+ <include name="org/jboss/jbossts/txbridge/demo/client/*"/>
+ </classes>
+ <!-- jsp files -->
+ <fileset dir="${web}" includes="*.jsp"/>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.xts,org.jboss.jts"/>
+ </manifest>
+ </war>
</target>
<!-- ##################################################################################### -->
- <property name="jbossas.home" location="/home/jhalli/IdeaProjects/jboss/jbossas_trunk/build/target/jboss-6.0.0-SNAPSHOT"/>
- <property name="jbossas.server" value="default"/>
+ <property name="jbossas.home" location="/home/paul/dev/jboss-as/build/target/jboss-as-7.1.0.Alpha2-SNAPSHOT"/>
+ <property name="jbossas.server" value="standalone"/>
<target name="deploy-service" depends="dist" description="deploy EJB to JBossAS">
- <copy file="${build}/txbridge-demo-service.jar" todir="${jbossas.home}/server/${jbossas.server}/deploy"/>
+ <copy file="${build}/txbridge-demo-service.jar" todir="${jbossas.home}/${jbossas.server}/deployments"/>
</target>
<target name="deploy-client" depends="dist" description="deploy Servlet to JBossAS">
- <copy file="${build}/txbridge-demo-client.war" todir="${jbossas.home}/server/${jbossas.server}/deploy"/>
+ <copy file="${build}/txbridge-demo-client.war" todir="${jbossas.home}/${jbossas.server}/deployments"/>
</target>
</project>
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/dd/persistence.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/dd/persistence.xml 2011-10-06 13:43:32 UTC (rev 37511)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/dd/persistence.xml 2011-10-06 13:50:38 UTC (rev 37512)
@@ -4,7 +4,7 @@
version="1.0">
<persistence-unit name="bistro">
- <jta-data-source>java:/DefaultDS</jta-data-source>
+ <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
<properties>
<property name="hibernate.hbm2ddl.auto"
value="create-drop"/>
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/client/BasicClient.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/client/BasicClient.java 2011-10-06 13:43:32 UTC (rev 37511)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/demo/src/org/jboss/jbossts/txbridge/demo/client/BasicClient.java 2011-10-06 13:50:38 UTC (rev 37512)
@@ -73,9 +73,10 @@
{
URL wsdlLocation = new URL("http://localhost:8080/txbridge-demo-service/BistroImpl?wsdl");
QName serviceName = new QName("http://bistro.demo.txbridge.jbossts.jboss.org/", "BistroImplService");
+ QName portName = new QName("http://bistro.demo.txbridge.jbossts.jboss.org/", "BistroImplPort");
Service service = Service.create(wsdlLocation, serviceName);
- bistro = service.getPort(Bistro.class);
+ bistro = service.getPort(portName, Bistro.class);
// we could have used @HandlerChain but it's nice to show a bit of variety...
BindingProvider bindingProvider = (BindingProvider)bistro;
More information about the jboss-svn-commits
mailing list