[jboss-svn-commits] JBL Code SVN: r17716 - in labs/jbosstm/trunk/XTS: demo/dd and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 11 06:49:25 EST 2008
Author: adinn
Date: 2008-01-11 06:49:25 -0500 (Fri, 11 Jan 2008)
New Revision: 17716
Added:
labs/jbosstm/trunk/XTS/demo/dd/jboss/application-sa.xml
Removed:
labs/jbosstm/trunk/XTS/demo/dd/weblogic/
labs/jbosstm/trunk/XTS/demo/dd/webmethods/
Modified:
labs/jbosstm/trunk/XTS/demo/build.sh
labs/jbosstm/trunk/XTS/demo/build.xml
labs/jbosstm/trunk/XTS/demo/dd/jboss/application.xml
labs/jbosstm/trunk/XTS/demo/xts-build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
fixes to XTS for AS 5.0 conformance cf. JBTM-123
removed weblogic and webmethods demo variants -- build.sh, build.xml
and xts-build.xml now only build a jboss demo
modified demo so default target, build, builds an ear for use with XTS
deployed as sar
added extra demo target sa-build which builds old ear with embedded
jta/XTS for use with standalone coordinator
fixed typo in sar/build.xml
Modified: labs/jbosstm/trunk/XTS/demo/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/demo/build.sh 2008-01-11 11:47:30 UTC (rev 17715)
+++ labs/jbosstm/trunk/XTS/demo/build.sh 2008-01-11 11:49:25 UTC (rev 17716)
@@ -21,7 +21,7 @@
#!/bin/sh
###############################################################################
# Wrapper script for building and deploying xts-demo #
-# Usage: build.sh [weblogic|jboss] <target> #
+# Usage: build.sh [jboss] <target> #
###############################################################################
if [ $# -ge 1 ]
@@ -34,5 +34,5 @@
fi
fi
-echo "Usage: `basename $0` [weblogic|jboss|webmethods] <target>"
+echo "Usage: `basename $0` [jboss] <target>"
exit 1
Modified: labs/jbosstm/trunk/XTS/demo/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/build.xml 2008-01-11 11:47:30 UTC (rev 17715)
+++ labs/jbosstm/trunk/XTS/demo/build.xml 2008-01-11 11:49:25 UTC (rev 17716)
@@ -33,16 +33,10 @@
<!-- ================================================================== -->
- <!-- Specify weblogic.home if you want a WebLogic build, -->
- <!-- webmethods.home for a webMethods build otherwise a JBoss build -->
- <!-- will be generated. -->
-
<!-- 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) -->
+ <!-- port (defaults to 8080 for jboss) -->
+ <!-- urlstub (defaults to xtsdemowebservices for JBoss) -->
<!-- deploy.dir The deployment directory for the ear -->
<!-- ================================================================== -->
@@ -67,14 +61,11 @@
<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"/>
@@ -115,42 +106,8 @@
</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">
+ <target name="init-properties">
<property name="hostname" value="localhost"/>
- <property name="port" value="7001"/>
- <property name="urlstub" value="xtsdemowebservices"/>
- <path id="compile.path">
- <path refid="lib.path"/>
- <path refid="ext.path"/>
- <fileset dir="${weblogic.home}/server/lib" includes="webservices.jar"/>
- </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">
@@ -159,7 +116,7 @@
</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 +134,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,56 +150,8 @@
<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">
- <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"/>
- <fileset dir="${build.dir}/classes">
- <include name="com/arjuna/xts/nightout/services/**"/>
- </fileset>
- <manifest>
- <attribute name="Class-Path" value="${lib.libs} ${ext.libs}"/>
- </manifest>
- </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}"/>
- <manifest>
- <attribute name="Class-Path" value="wstx.jar"/>
- </manifest>
- </war>
- </target>
-
- <target name="jboss-webapp" depends="compile" if="jboss.build">
+ <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>
@@ -261,20 +168,7 @@
</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/**"/>
- </ear>
- </target>
-
- <target name="jboss-ear" depends="jboss-webapp, config" if="jboss.build">
+ <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"/>
@@ -284,59 +178,9 @@
</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"/>
+ <target name="build" depends="jboss-ear"/>
- <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}">
@@ -386,26 +230,11 @@
<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">
+ <target name="deploy" depends="build, undeploy">
<copy file="${build.dir}/xts-demo.ear" tofile="${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>
-
- <target name="undeploy" depends="undeploy-ears, undeploy-exploded"/>
-
- <target name="undeploy-ears" unless="webmethods.home">
+ <target name="undeploy">
<delete file="${deploy.dir}/xts-demo.ear"/>
</target>
-
- <target name="undeploy-exploded" if="webmethods.home">
- <delete dir="${webmethods.deploy.dir}"/>
- </target>
</project>
Added: labs/jbosstm/trunk/XTS/demo/dd/jboss/application-sa.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/application-sa.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/application-sa.xml 2008-01-11 11:49:25 UTC (rev 17716)
@@ -0,0 +1,73 @@
+<!--
+ 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.
+-->
+
+<!-- $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>
Property changes on: labs/jbosstm/trunk/XTS/demo/dd/jboss/application-sa.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: labs/jbosstm/trunk/XTS/demo/dd/jboss/application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/jboss/application.xml 2008-01-11 11:47:30 UTC (rev 17715)
+++ labs/jbosstm/trunk/XTS/demo/dd/jboss/application.xml 2008-01-11 11:49:25 UTC (rev 17716)
@@ -30,34 +30,6 @@
<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>
Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml 2008-01-11 11:47:30 UTC (rev 17715)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml 2008-01-11 11:49:25 UTC (rev 17716)
@@ -33,18 +33,25 @@
<!-- ================================================================== -->
- <!-- Specify weblogic.home if you want a WebLogic build, -->
- <!-- webmethods.home for a webMethods build otherwise a JBoss build -->
- <!-- will be generated. -->
+ <!-- n.b. run this via the build.sh script to ensure that the property -->
+ <!-- settings in jboss.properties are set automatically -->
<!-- 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) -->
+ <!-- port (defaults to 8080 for jboss) -->
+ <!-- urlstub (defaults to xtsdemowebservices for JBoss) -->
<!-- deploy.dir The deployment directory for the ear -->
+
+ <!-- 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 -->
+
+ <!-- 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. -->
+
<!-- ================================================================== -->
<xmlproperty file="${xmlpropertyfile}" keeproot="false"/>
@@ -68,15 +75,11 @@
<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="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
@@ -109,42 +112,8 @@
</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">
+ <target name="init-properties">
<property name="hostname" value="localhost"/>
- <property name="port" value="7001"/>
- <property name="urlstub" value="xtsdemowebservices"/>
- <path id="compile.path">
- <path refid="lib.path"/>
- <path refid="ext.path"/>
- <fileset dir="${weblogic.home}/server/lib" includes="webservices.jar"/>
- </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">
@@ -153,7 +122,7 @@
</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}"/>
@@ -170,15 +139,22 @@
</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>
</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>
+ </war>
+ </target>
+
<target name="config" depends="insertcfg">
<filter token="hostname" value="${hostname}"/>
<filter token="port" value="${port}"/>
@@ -188,14 +164,11 @@
<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>
+ <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">
- <include name="com/arjuna/xts/nightout/services/**/*"/>
+ <include name="com/arjuna/xts/nightout/services/**"/>
</classes>
<manifest>
<attribute name="Class-Path" value="${lib.libs} ${ext.libs}"/>
@@ -203,30 +176,13 @@
</war>
</target>
- <target name="jboss-webservices" depends="compile" if="jboss.build">
- <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"/>
- <fileset dir="${build.dir}/classes">
- <include name="com/arjuna/xts/nightout/services/**"/>
- </fileset>
- <manifest>
- <attribute name="Class-Path" value="${lib.libs} ${ext.libs}"/>
- </manifest>
- </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">
+ <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"/>
</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">
+ <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/**/*"/>
</classes>
@@ -234,10 +190,11 @@
<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-webapp" depends="compile" if="jboss.build">
+ <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>
@@ -247,89 +204,32 @@
<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="weblogic-ear" depends="weblogic-webservices, weblogic-webapp, config" if="weblogic.home">
- <copy todir="${appinflib.dir}">
- <fileset dir="${xts.home}/lib" includes="*.jar"/>
- <fileset dir="${xts.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="${xts.home}/webapps" includes="*.war" excludes="ws-t.war ws-c.war"/>
- <fileset dir="${build.dir}" includes="xts-demo-webservices.war xts-demo.war ws-t.war ws-c.war"/>
- <fileset dir="${build.dir}" includes="APP-INF/**"/>
+ <!-- the ear files -->
+ <target name="jboss-ear" depends="jboss-webservices, jboss-webapp">
+ <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"/>
</ear>
</target>
- <target name="jboss-ear" depends="jboss-webservices, 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 ws-t.war ws-c.war"/>
+ <target name="jboss-sa-ear" depends="jboss-sa-webservices, jboss-sa-webapp, config">
+ <ear earfile="${build.dir}/xts-sa-demo.ear"
+ appxml="${jboss.dd.dir}/application-sa.xml">
+ <fileset dir="${build.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="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"/>
+ <target name="build" depends="jboss-ear"/>
- <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"/>
+ <target name="sa-build" depends="jboss-sa-ear"/>
- <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="${xts.home}/lib" includes="*.jar"/>
- <fileset dir="${xts.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="insertcfg" depends="init">
<filter token="hostname" value="${hostname}"/>
<filter token="port" value="${port}"/>
@@ -354,26 +254,19 @@
<delete dir="${build.dir}/tmp/ws-t"/>
</target>
- <target name="deploy" depends="deploy-ears, deploy-exploded"/>
-
- <target name="deploy-ears" depends="build, undeploy" unless="webmethods.home">
+ <target name="deploy" depends="build, undeploy">
<copy file="${build.dir}/xts-demo.ear" tofile="${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="${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 name="sa-deploy" depends="sa-build, undeploy">
+ <copy file="${build.dir}/xts-sa-demo.ear" tofile="${deploy.dir}/xts-sa-demo.ear"/>
</target>
- <target name="undeploy-exploded" if="webmethods.home">
- <delete dir="${webmethods.deploy.dir}"/>
+ <target name="sa-undeploy">
+ <delete file="${deploy.dir}/xts-sa-demo.ear"/>
</target>
</project>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2008-01-11 11:47:30 UTC (rev 17715)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2008-01-11 11:49:25 UTC (rev 17716)
@@ -64,7 +64,7 @@
integration jar here. however it does not contain some stuff
we need e.g. rmi, system, logger classes etc, so we pick up
jbossall-client instead. also, pending some refactoring in
- teh AS we still depend upon class
+ the AS we still depend upon class
org.jboss.system.ServiceMBeanSupport which is not in the
integration/client jars. we can find it in the lib dir in
jboss-system-jmx.jar.
More information about the jboss-svn-commits
mailing list