[jboss-svn-commits] JBL Code SVN: r18577 - in labs/jbosstm/trunk/XTS/demo: srcrpc and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 25 12:41:48 EST 2008
Author: adinn
Date: 2008-02-25 12:41:48 -0500 (Mon, 25 Feb 2008)
New Revision: 18577
Added:
labs/jbosstm/trunk/XTS/demo/src/
labs/jbosstm/trunk/XTS/demo/srcrpc/
labs/jbosstm/trunk/XTS/demo/srcrpc/com/
Removed:
labs/jbosstm/trunk/XTS/demo/src/
labs/jbosstm/trunk/XTS/demo/srcrpc/com/
Modified:
labs/jbosstm/trunk/XTS/demo/build.xml
labs/jbosstm/trunk/XTS/demo/jboss.properties
labs/jbosstm/trunk/XTS/demo/xts-build.xml
Log:
reworked demo to include both JaxWS and JaxRPC based versions and to work in AS5.0B4 -- JaxWS code still to be inserted
Modified: labs/jbosstm/trunk/XTS/demo/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/build.xml 2008-02-25 14:31:04 UTC (rev 18576)
+++ labs/jbosstm/trunk/XTS/demo/build.xml 2008-02-25 17:41:48 UTC (rev 18577)
@@ -29,74 +29,21 @@
<!-- -->
<!-- ====================================================================== -->
-<project name="xts-demo" default="build" basedir=".">
+<project name="xts-demo" default="distribution" basedir=".">
<!-- ================================================================== -->
- <!-- The properties to override are the following: -->
- <!-- hostname (defaults to localhost) -->
- <!-- port (defaults to 8080 for jboss) -->
- <!-- urlstub (defaults to xtsdemowebservices for JBoss) -->
-
- <!-- deploy.dir The deployment directory for the ear -->
- <!-- ================================================================== -->
-
<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"/>
-
- <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"/>
-
- <!-- ================================================================== -->
-
- <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="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="docs.dir" location="docs"/>
<property name="xsl.dir" location="xsl"/>
<property name="html.dir" location="html"/>
<property name="xsl.file" value="ATL_LookAndFeel.xsl"/>
- <property name="javac.debug" value="on"/>
- <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}"/>
- </filterset>
-
<target name="clean">
- <delete dir="${build.dir}"/>
<delete dir="${html.dir}"/>
<delete>
<fileset dir="." includes="**/*.bak" defaultexcludes="no"/>
@@ -106,81 +53,10 @@
</delete>
</target>
- <target name="init-properties">
- <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">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/classes"/>
- <mkdir dir="${build.config}"/>
- <mkdir dir="${build.soapconfig}"/>
- <mkdir dir="${appinf.dir}"/>
- <mkdir dir="${appinflib.dir}"/>
+ <target name="init">
<mkdir dir="${html.dir}"/>
</target>
- <target name="compile" depends="init">
- <javac destdir="${build.dir}/classes" debug="${javac.debug}"
- optimize="${javac.optimize}" deprecation="${javac.deprecation}" >
- <classpath>
- <path refid="compile.path"/>
- </classpath>
- <src path="${src.dir}"/>
- <patternset>
- <include name="com/arjuna/xts/nightout/clients/jboss/**"/>
- <include name="com/arjuna/xts/nightout/services/**"/>
- </patternset>
- </javac>
- </target>
-
- <!-- the server side elements -->
- <target name="config">
- <filter token="hostname" value="${hostname}"/>
- <filter token="port" value="${port}"/>
- <copy todir="${build.config}" filtering="true">
- <fileset dir="${conf.dir}" includes="wscf.xml wstx.xml wst.xml"/>
- </copy>
- <jar destfile="${build.dir}/config.jar" basedir="${build.config}"/>
- </target>
-
- <!-- 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="${web.dir}"/>
- <manifest>
- <attribute name="Class-Path" value="wstx.jar"/>
- </manifest>
- <webinf dir="${jboss.dd.dir}" includes="wsdl/**, client-jaxrpc-mapping.xml"/>
- </war>
- </target>
-
- <target name="jboss-ear" depends="jboss-webapp, config">
- <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="build" depends="jboss-ear"/>
-
<target name="docs" depends="init">
<copy todir="${html.dir}">
<fileset dir="${docs.dir}">
@@ -194,13 +70,6 @@
</style>
</target>
- <target name="xml2jsp" depends="init">
- <style processor="trax" style="${xsl.dir}/${xsl.file}" basedir="${src.dir}/com/arjuna/xts/nightout/clients"
- includes="*.xml" destdir="${src.dir}/com/arjuna/xts/nightout/clients" extension=".html">
- <param name="rootpath" expression="."/>
- </style>
- </target>
-
<!-- hook to 'inherit' distrib dir if we are called by the ArjuaXTS install script -->
<target name="select-distribution-dir" if="com.arjuna.mwlabs.installationdirectory">
<property name="selected-distrib-dir" value="${com.arjuna.mwlabs.installationdirectory}/demo"/>
@@ -217,8 +86,10 @@
<copy todir="${selected-distrib-dir}">
<fileset dir=".">
<include name="src/**"/>
+ <include name="srcws/**"/>
<include name="html/**"/>
<include name="dd/**"/>
+ <include name="ddws/**"/>
<include name="web/**"/>
<include name="*.properties"/>
<include name="build.sh"/>
@@ -229,12 +100,4 @@
<!-- remove our dirty laundry -->
<copy file="xts-build.xml" tofile="${selected-distrib-dir}/build.xml"/>
</target>
-
- <target name="deploy" depends="build, undeploy">
- <copy file="${build.dir}/xts-demo.ear" tofile="${deploy.dir}/xts-demo.ear"/>
- </target>
-
- <target name="undeploy">
- <delete file="${deploy.dir}/xts-demo.ear"/>
- </target>
</project>
Modified: labs/jbosstm/trunk/XTS/demo/jboss.properties
===================================================================
--- labs/jbosstm/trunk/XTS/demo/jboss.properties 2008-02-25 14:31:04 UTC (rev 18576)
+++ labs/jbosstm/trunk/XTS/demo/jboss.properties 2008-02-25 17:41:48 UTC (rev 18577)
@@ -30,9 +30,9 @@
The default services are the ones running within JBoss.
-->
<arjuna>
- <hostname>JBOSS_HOSTNAME</hostname>
- <port>JBOSS_PORT</port>
- <urlstub>JBOSS_URLSTUB</urlstub>
+ <hostname>localhost</hostname>
+ <port>8080</port>
+ <urlstub></urlstub>
<deploy>
<dir>JBOSS_DEPLOY_DIR</dir>
</deploy>
@@ -56,10 +56,10 @@
-->
<!-- 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>
+ <restaurantATURL>http://localhost:8080/xtsdemowebservices/RestaurantServiceAT</restaurantATURL>
+ <restaurantBAURL>http://localhost:8080/xtsdemowebservices/RestaurantServiceBA</restaurantBAURL>
+ <taxiATURL>http://localhost:8080/xtsdemowebservices/TaxiServiceAT</taxiATURL>
+ <taxiBAURL>http://localhost:8080/xtsdemowebservices/TaxiServiceBA</taxiBAURL>
+ <theatreATURL>http://localhost:8080/xtsdemowebservices/TheatreServiceAT</theatreATURL>
+ <theatreBAURL>http://localhost:8080/xtsdemowebservices/TheatreServiceBA</theatreBAURL>
</arjuna>
Copied: labs/jbosstm/trunk/XTS/demo/srcrpc (from rev 18509, labs/jbosstm/trunk/XTS/demo/src)
Copied: labs/jbosstm/trunk/XTS/demo/srcrpc/com (from rev 18576, labs/jbosstm/trunk/XTS/demo/src/com)
Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml 2008-02-25 14:31:04 UTC (rev 18576)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml 2008-02-25 17:41:48 UTC (rev 18577)
@@ -43,43 +43,65 @@
<!-- deploy.dir The deployment directory for the ear -->
+ <property environment="env"/>
+ <property name="deploy.dir" location="${env.JBOSS_HOME}/server/default/deploy"/>
+
<!-- default target build will build an ear file for the demo app for -->
<!-- use in a JBoss server with XTS deployed as a JBoss service -->
- <!-- archive -->
+ <!-- archive. The demo client communicates with demo services deployed -->
+ <!-- as JaxWS endpoints -->
<!-- target sa-build will build an ear file for the demo app for use -->
<!-- with a remote coordinator. this contains the XTS code and config -->
<!-- files bundled into an ear file to provide the client side -->
<!-- services. -->
+ <!-- target buildrpc will build an ear file for the demo app using -->
+ <!-- JaxRPC to communicate between the demo client and services -->
+
+ <!-- target sa-buildrpc will build an ear file for the demo app for -->
+ <!-- with a remote coordinator using JaxRPC to communicate between the -->
+ <!-- demo client and services -->
+
<!-- ================================================================== -->
<xmlproperty file="${xmlpropertyfile}" keeproot="false"/>
+ <property environment="env"/>
+
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
<property name="xts.home" value=".."/>
<property name="conf.dir" location="${xts.home}/conf"/>
<property name="lib.dir" location="${xts.home}/lib"/>
<property name="ext.dir" location="${lib.dir}/ext"/>
+ <property name="jboss.client.lib.dir" location="${jboss.home}/client"/>
<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="jboss.client.libs" value="jbossall-client.jar jboss-jaxws.jar"/>
+ <property name="ext.compile" value="${ext.libs} wstx-asl-2.0.3.jar 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"/>
+ <property name="ext.package" value="${ext.libs} jbossts-common.jar commons-logging.jar stax-api-1.0.jar"/>
<!-- ================================================================== -->
<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="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="buildrpc.dir" location="buildrpc"/>
+ <property name="srcrpc.dir" location="srcrpc"/>
+ <property name="ddrpc.dir" location="ddrpc"/>
+ <property name="jboss.ddrpc.dir" location="${ddrpc.dir}/jboss"/>
+ <property name="buildrpc.config" location="${buildrpc.dir}/config"/>
+ <property name="buildrpc.soapconfig" location="${buildrpc.dir}/soapconfig"/>
+
+ <property name="web.dir" location="web"/>
+
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
@@ -90,6 +112,10 @@
<fileset dir="${ext.dir}" includes="${ext.compile}"/>
</path>
+ <path id="jboss.client.path">
+ <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.libs}"/>
+ </path>
+
<filterset id="webxml.filter">
<filter token="restaurantATURL" value="${restaurantATURL}"/>
<filter token="restaurantBAURL" value="${restaurantBAURL}"/>
@@ -104,6 +130,7 @@
<target name="clean">
<delete dir="${build.dir}"/>
+ <delete dir="${buildrpc.dir}"/>
<delete>
<fileset dir="." includes="**/*.bak" defaultexcludes="no"/>
<fileset dir="." includes="**/*~" defaultexcludes="no"/>
@@ -118,6 +145,7 @@
<property name="urlstub" value="xtsdemowebservices"/>
<path id="compile.path">
<path refid="lib.path"/>
+ <path refid="jboss.client.path"/>
<path refid="ext.path"/>
</path>
</target>
@@ -127,10 +155,29 @@
<mkdir dir="${build.dir}/classes"/>
<mkdir dir="${build.config}"/>
<mkdir dir="${build.soapconfig}"/>
- <mkdir dir="${appinf.dir}"/>
- <mkdir dir="${appinflib.dir}"/>
</target>
+ <target name="initrpc" depends="init-properties">
+ <mkdir dir="${buildrpc.dir}"/>
+ <mkdir dir="${buildrpc.dir}/classes"/>
+ <mkdir dir="${buildrpc.config}"/>
+ <mkdir dir="${buildrpc.soapconfig}"/>
+ </target>
+
+ <target name="compilerpc" depends="initrpc">
+ <javac destdir="${buildrpc.dir}/classes" debug="${javac.debug}"
+ optimize="${javac.optimize}" deprecation="${javac.deprecation}" >
+ <classpath>
+ <path refid="compile.path"/>
+ </classpath>
+ <src path="${srcrpc.dir}"/>
+ <patternset>
+ <include name="com/arjuna/xts/nightout/clients/jboss/**"/>
+ <include name="com/arjuna/xts/nightout/services/**"/>
+ </patternset>
+ </javac>
+ </target>
+
<target name="compile" depends="init">
<javac destdir="${build.dir}/classes" debug="${javac.debug}"
optimize="${javac.optimize}" deprecation="${javac.deprecation}" >
@@ -139,19 +186,29 @@
</classpath>
<src path="${src.dir}"/>
<patternset>
- <include name="com/arjuna/xts/nightout/clients/jboss/**"/>
- <include name="com/arjuna/xts/nightout/services/**"/>
+ <!-- client app -->
+ <include name="com/jboss/jbosstm/xts/demo/client/**/*"/>
+ <!-- server impl -->
+ <include name="com/jboss/jbosstm/xts/demo/services/**"/>
+ <!-- generated server interfaces and service classes -->
+ <include name="com/jboss/jbosstm/xts/demo/restaurant/**"/>
+ <include name="com/jboss/jbosstm/xts/demo/taxi/**"/>
+ <include name="com/jboss/jbosstm/xts/demo/theatre/**"/>
</patternset>
</javac>
</target>
<!-- the server side elements -->
<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="client-web-app.xml service-web-app.xml application-sa.xml application.xml"/>
- <classes dir="${build.dir}/classes">
- <include name="com/arjuna/xts/nightout/services/**"/>
- </classes>
+ <copy tofile="${build.dir}/classes/com/jboss/jbosstm/xts/demo/services/context-handlers.xml"
+ file="${jboss.dd.dir}/context-handlers.xml"/>
+ <war destfile="${build.dir}/xts-demo-webservices.war" webxml="${jboss.dd.dir}/service-web-app.xml" >
+ <webinf dir="${jboss.dd.dir}" includes="wsdl/*.wsdl"/>
+ <webinf dir="${build.dir}/classes"
+ includes="com/jboss/jbosstm/xts/demo/services/**/*"/>
+ <manifest>
+ <attribute name="Class-Path" value="/WEB-INF ${lib.libs}"/>
+ </manifest>
</war>
</target>
@@ -165,11 +222,42 @@
</target>
<target name="jboss-sa-webservices" depends="compile">
- <war destfile="${build.dir}/xts-sa-demo-webservices.war" webxml="${jboss.dd.dir}/service-web-app.xml">
- <webinf dir="${jboss.dd.dir}" excludes="client-web-app.xml service-web-app.xml application-sa.xml application.xml"/>
- <classes dir="${build.dir}/classes">
+ <copy tofile="${build.dir}/classes/com/jboss/jbosstm/xts/demo/services/context-handlers.xml"
+ file="${jboss.dd.dir}/context-handlers.xml"/>
+ <war destfile="${build.dir}/xts-sa-demo-webservices.war" webxml="${jboss.dd.dir}/service-web-app.xml" >
+ <webinf dir="${jboss.dd.dir}" includes="webservices.xml wsdl/*.wsdl"/>
+ <webinf dir="${buildws.dir}/classes"
+ includes="com/jboss/jbosstm/xts/demo/services/**/*"/>
+ <manifest>
+ <attribute name="Class-Path" value="/WEB-INF ${lib.libs} ${ext.libs}"/>
+ </manifest>
+ </war>
+ </target>
+
+ <target name="jboss-webservicesrpc" depends="compilerpc">
+ <war destfile="${buildrpc.dir}/xts-demo-webservices.war" webxml="${jboss.ddrpc.dir}/service-web-app.xml">
+ <webinf dir="${jboss.ddrpc.dir}" excludes="client-web-app.xml service-web-app.xml application-sa.xml application.xml"/>
+ <classes dir="${buildrpc.dir}/classes">
<include name="com/arjuna/xts/nightout/services/**"/>
</classes>
+ </war>
+ </target>
+
+ <target name="configrpc" depends="insertcfgrpc">
+ <filter token="hostname" value="${hostname}"/>
+ <filter token="port" value="${port}"/>
+ <copy todir="${buildrpc.config}" filtering="true">
+ <fileset dir="${conf.dir}" includes="wscf.xml wstx.xml wst.xml"/>
+ </copy>
+ <jar destfile="${buildrpc.dir}/config.jar" basedir="${buildrpc.config}"/>
+ </target>
+
+ <target name="jboss-sa-webservicesrpc" depends="compilerpc">
+ <war destfile="${buildrpc.dir}/xts-sa-demo-webservices.war" webxml="${jboss.ddrpc.dir}/service-web-app.xml">
+ <webinf dir="${jboss.ddrpc.dir}" excludes="client-web-app.xml service-web-app.xml application-sa.xml application.xml"/>
+ <classes dir="${buildrpc.dir}/classes">
+ <include name="com/arjuna/xts/nightout/services/**"/>
+ </classes>
<manifest>
<attribute name="Class-Path" value="${lib.libs} ${ext.libs}"/>
</manifest>
@@ -177,6 +265,20 @@
</target>
<!-- 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/jboss/jbosstm/xts/demo/services/**/*"/>
+ </classes>
+ <fileset dir="${web.dir}"/>
+ <webinf dir="${jboss.dd.dir}" includes="wsdl/**"/>
+ </war>
+ </target>
+
<target name="jboss-sa-webapp" depends="compile">
<copy tofile="${build.dir}/client-web-app.xml" file="${jboss.dd.dir}/client-web-app.xml">
<filterset refid="webxml.filter"/>
@@ -184,30 +286,47 @@
<war warfile="${build.dir}/xts-sa-demo.war" webxml="${build.dir}/client-web-app.xml">
<classes dir="${build.dir}/classes">
- <exclude name="com/arjuna/xts/nightout/services/**/*"/>
+ <exclude name="com/jboss/jbosstm/xts/demo/services/**/*"/>
</classes>
<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/**"/>
</war>
</target>
- <target name="jboss-webapp" depends="compile">
- <copy tofile="${build.dir}/client-web-app.xml" file="${jboss.dd.dir}/client-web-app.xml">
+ <target name="jboss-webapprpc" depends="compilerpc">
+ <copy tofile="${buildrpc.dir}/client-web-app.xml" file="${jboss.ddrpc.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">
+ <war warfile="${buildrpc.dir}/xts-demo.war" webxml="${buildrpc.dir}/client-web-app.xml">
+ <classes dir="${buildrpc.dir}/classes">
<exclude name="com/arjuna/xts/nightout/services/**/*"/>
</classes>
<fileset dir="${web.dir}"/>
- <webinf dir="${jboss.dd.dir}" includes="wsdl/**, client-jaxrpc-mapping.xml"/>
+ <webinf dir="${jboss.ddrpc.dir}" includes="wsdl/**"/>
</war>
</target>
+ <target name="jboss-sa-webapprpc" depends="compilerpc">
+ <copy tofile="${buildrpc.dir}/client-web-app.xml" file="${jboss.ddrpc.dir}/client-web-app.xml">
+ <filterset refid="webxml.filter"/>
+ </copy>
+
+ <war warfile="${buildrpc.dir}/xts-sa-demo.war" webxml="${buildrpc.dir}/client-web-app.xml">
+ <classes dir="${buildrpc.dir}/classes">
+ <exclude name="com/arjuna/xts/nightout/services/**/*"/>
+ </classes>
+ <fileset dir="${web.dir}"/>
+ <manifest>
+ <attribute name="Class-Path" value="wstx.jar"/>
+ </manifest>
+ <webinf dir="${jboss.ddrpc.dir}" includes="wsdl/**"/>
+ </war>
+ </target>
+
<!-- the ear files -->
<target name="jboss-ear" depends="jboss-webservices, jboss-webapp">
<ear earfile="${build.dir}/xts-demo.ear"
@@ -226,10 +345,31 @@
</ear>
</target>
+ <target name="jboss-earrpc" depends="jboss-webservicesrpc, jboss-webapprpc">
+ <ear earfile="${buildrpc.dir}/xts-demo.ear"
+ appxml="${jboss.ddrpc.dir}/application.xml">
+ <fileset dir="${buildrpc.dir}" includes="xts-demo-webservices.war xts-demo.war"/>
+ </ear>
+ </target>
+
+ <target name="jboss-sa-earrpc" depends="jboss-sa-webservicesrpc, jboss-sa-webapprpc, configrpc">
+ <ear earfile="${buildrpc.dir}/xts-sa-demo.ear"
+ appxml="${jboss.ddrpc.dir}/application-sa.xml">
+ <fileset dir="${buildrpc.dir}" includes="xts-sa-demo-webservices.war xts-sa-demo.war config.jar ws-t.war ws-c.war"/>
+ <fileset dir="${xts.home}/lib" includes="*.jar"/>
+ <fileset dir="${xts.home}/lib/ext" includes="${ext.package}"/>
+ <fileset dir="${xts.home}/webapps" includes="*.war" excludes="ws-t.war ws-c.war"/>
+ </ear>
+ </target>
+
<target name="build" depends="jboss-ear"/>
<target name="sa-build" depends="jboss-sa-ear"/>
+ <target name="buildrpc" depends="jboss-earrpc"/>
+
+ <target name="sa-buildrpc" depends="jboss-sa-earrpc"/>
+
<target name="insertcfg" depends="init">
<filter token="hostname" value="${hostname}"/>
<filter token="port" value="${port}"/>
@@ -254,6 +394,30 @@
<delete dir="${build.dir}/tmp/ws-t"/>
</target>
+ <target name="insertcfgrpc" depends="initrpc">
+ <filter token="hostname" value="${hostname}"/>
+ <filter token="port" value="${port}"/>
+ <filter token="urlstub" value="${urlstub}"/>
+
+ <unjar src="${xts.home}/webapps/ws-c.war" dest="${build.dir}/tmp/ws-c"/>
+
+ <copy file="${xts.home}/coordinator/dd/ws-c_web-app.xml"
+ tofile="${buildrpc.dir}/tmp/ws-c/WEB-INF/web.xml" filtering="true" overwrite="true"/>
+
+ <jar destfile="${buildrpc.dir}/ws-c.war" basedir="${buildrpc.dir}/tmp/ws-c" manifest="${buildrpc.dir}/tmp/ws-c/META-INF/MANIFEST.MF"/>
+
+ <delete dir="${buildrpc.dir}/tmp/ws-c"/>
+
+ <unjar src="${xts.home}/webapps/ws-t.war" dest="${build.dir}/tmp/ws-t"/>
+
+ <copy file="${xts.home}/coordinator/dd/ws-t_web-app.xml"
+ tofile="${buildrpc.dir}/tmp/ws-t/WEB-INF/web.xml" filtering="true" overwrite="true"/>
+
+ <jar destfile="${buildrpc.dir}/ws-t.war" basedir="${buildrpc.dir}/tmp/ws-t" manifest="${buildrpc.dir}/tmp/ws-t/META-INF/MANIFEST.MF"/>
+
+ <delete dir="${buildrpc.dir}/tmp/ws-t"/>
+ </target>
+
<target name="deploy" depends="build, undeploy">
<copy file="${build.dir}/xts-demo.ear" tofile="${deploy.dir}/xts-demo.ear"/>
</target>
@@ -269,4 +433,20 @@
<target name="sa-undeploy">
<delete file="${deploy.dir}/xts-sa-demo.ear"/>
</target>
+
+ <target name="deployrpc" depends="buildrpc, undeployrpc">
+ <copy file="${buildrpc.dir}/xts-demo.ear" tofile="${deploy.dir}/xts-demo.ear"/>
+ </target>
+
+ <target name="undeployrpc">
+ <delete file="${deploy.dir}/xts-demo.ear"/>
+ </target>
+
+ <target name="sa-deployrpc" depends="sa-buildrpc, sa-undeployrpc">
+ <copy file="${buildrpc.dir}/xts-sa-demo.ear" tofile="${deploy.dir}/xts-sa-demo.ear"/>
+ </target>
+
+ <target name="sa-undeployrpc">
+ <delete file="${deploy.dir}/xts-sa-demo.ear"/>
+ </target>
</project>
More information about the jboss-svn-commits
mailing list