[jboss-svn-commits] JBL Code SVN: r21140 - in labs/jbosstm/trunk/XTS: WS-T and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 21 05:00:39 EDT 2008
Author: adinn
Date: 2008-07-21 05:00:39 -0400 (Mon, 21 Jul 2008)
New Revision: 21140
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WSAS/build.xml
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
removed unnecessary war classpath entries to avoid problem with AS5.0.0.CR1 deployer (see JBDEPLOY-59) and also removed workaround from sar build
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2008-07-21 06:32:32 UTC (rev 21139)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2008-07-21 09:00:39 UTC (rev 21140)
@@ -275,17 +275,10 @@
</filterset>
</copy>
<copy file="${dev.dd.dir}/ws-c_handlers.xml" tofile="${build.dev.classes11.dir}/handlers.xml"/>
- <war warfile="${build.dev.webapps.dir}/ws-c10.war" webxml="${build.dev.dd.dir}/web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="ws-c10.jar"/>
- </manifest>
- </war>
+ <war warfile="${build.dev.webapps.dir}/ws-c10.war" webxml="${build.dev.dd.dir}/web-app.xml"/>
<war warfile="${build.dev.webapps.dir}/ws-c11.war" webxml="${build.dev.dd.dir}/web-app11.xml">
<webinf dir="${build.dir}/dev/classes11" includes="classes/com/arjuna/webservices11/wscoor/sei/* classes/handlers.xml"/>
<webinf dir="${build.dev.dd.dir}" includes="wsdl/**"/>
- <manifest>
- <attribute name="Class-Path" value="ws-c11.jar"/>
- </manifest>
</war>
</target>
@@ -316,15 +309,9 @@
</filterset>
</copy>
<war warfile="${build.tests.webapps.dir}/ws-c-tests.war" webxml="${build.tests.dd.dir}/web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="ws-c10.jar ws-c.jar ${tests.libs}"/>
- </manifest>
<classes dir="${build.tests.classes.dir}"/>
</war>
<war warfile="${build.tests.webapps.dir}/ws-c11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
- <manifest>
- <attribute name="Class-Path" value="ws-c10.jar ws-c.jar ${tests.libs}"/>
- </manifest>
<classes dir="${build.tests.classes.dir}"/>
</war>
<ear earfile="${build.tests.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c-tests_application.xml">
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2008-07-21 06:32:32 UTC (rev 21139)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2008-07-21 09:00:39 UTC (rev 21140)
@@ -307,17 +307,10 @@
</filterset>
</copy>
<copy file="${dev.dd.dir}/ws-t_handlers.xml" tofile="${build.dev.classes11.dir}/handlers.xml"/>
- <war warfile="${build.dev.webapps.dir}/ws-t10.war" webxml="${build.dev.dd.dir}/web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="ws-t10.jar ws-t.jar"/>
- </manifest>
- </war>
+ <war warfile="${build.dev.webapps.dir}/ws-t10.war" webxml="${build.dev.dd.dir}/web-app.xml"/>
<war warfile="${build.dev.webapps.dir}/ws-t11.war" webxml="${build.dev.dd.dir}/web-app11.xml">
<webinf dir="${build.dir}/dev/classes11" includes="classes/com/arjuna/webservices11/wsat/sei/* classes/com/arjuna/webservices11/wsba/sei/* classes/com/arjuna/webservices11/wsarjtx/sei/* classes/handlers.xml"/>
<webinf dir="${build.dev.dd.dir}" includes="wsdl/**"/>
- <manifest>
- <attribute name="Class-Path" value="WEB-INF/classes ws-c.jar ws-t11.jar ws-t.jar"/>
- </manifest>
</war>
</target>
@@ -351,9 +344,6 @@
</filterset>
</copy>
<war warfile="${build.tests.webapps.dir}/ws-t-tests.war" webxml="${build.tests.dd.dir}/web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="ws-t-tests.jar"/>
- </manifest>
</war>
<copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app11.xml">
<filterset>
@@ -362,9 +352,6 @@
</filterset>
</copy>
<war warfile="${build.tests.webapps.dir}/ws-t11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
- <manifest>
- <attribute name="Class-Path" value="ws-t-tests.jar"/>
- </manifest>
</war>
<ear earfile="${build.tests.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t-tests_application.xml">
<!--
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2008-07-21 06:32:32 UTC (rev 21139)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2008-07-21 09:00:39 UTC (rev 21140)
@@ -221,9 +221,6 @@
</filterset>
</copy>
<war warfile="${com.arjuna.mwlabs.wsas.tests.webapps.dest}/wsas-tests.war" webxml="${com.arjuna.mwlabs.wsas.tests.dd.dest}/web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="${tests.depend.libs}"/>
- </manifest>
<classes dir="${com.arjuna.mwlabs.wsas.tests.dest}"/>
</war>
<ear earfile="${com.arjuna.mwlabs.wsas.tests.webapps.dest}/wsas-tests.ear" appxml="${com.arjuna.mwlabs.wsas.tests.dd}/wsas-tests_application.xml">
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2008-07-21 06:32:32 UTC (rev 21139)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2008-07-21 09:00:39 UTC (rev 21140)
@@ -189,16 +189,8 @@
value="com.arjuna.mw.*"/>
<target name="com.arjuna.mw.wscf.war" depends="com.arjuna.mw.wscf.jar">
- <war warfile="${com.arjuna.mwlabs.wscf.war.dest}/${com.arjuna.mwlabs.ts.modulename}10.war" webxml="xml/wscf_web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="${com.arjuna.mwlabs.ts.modulename}.10jar"/>
- </manifest>
- </war>
- <war warfile="${com.arjuna.mwlabs.wscf.war.dest}/${com.arjuna.mwlabs.ts.modulename}11.war" webxml="xml/wscf11_web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="${com.arjuna.mwlabs.ts.modulename}11.jar"/>
- </manifest>
- </war>
+ <war warfile="${com.arjuna.mwlabs.wscf.war.dest}/${com.arjuna.mwlabs.ts.modulename}10.war" webxml="xml/wscf_web-app.xml"/>
+ <war warfile="${com.arjuna.mwlabs.wscf.war.dest}/${com.arjuna.mwlabs.ts.modulename}11.war" webxml="xml/wscf11_web-app.xml"/>
</target>
<!-- Jar targets -->
@@ -353,16 +345,8 @@
<attribute name="Class-Path" value="${tests.depend.libs}"/>
</manifest>
</jar>
- <war warfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.war" webxml="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="wscf-tests.jar"/>
- </manifest>
- </war>
- <war warfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf11-tests.war" webxml="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app11.xml">
- <manifest>
- <attribute name="Class-Path" value="wscf-tests.jar"/>
- </manifest>
- </war>
+ <war warfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.war" webxml="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app.xml"/>
+ <war warfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf11-tests.war" webxml="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app11.xml"/>
<ear earfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.ear" appxml="${com.arjuna.mwlabs.wscf.tests.dd}/wscf-tests_application.xml">
<!-- we only need to deploy the ext test libs (junit) and
the tests war in JBoss AS 5.0. the rest of the XTS
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2008-07-21 06:32:32 UTC (rev 21139)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2008-07-21 09:00:39 UTC (rev 21140)
@@ -220,16 +220,8 @@
<property name="com.arjuna.mwlabs.wstx.htdocs.list" value="com.arjuna.mw.*"/>
<target name="com.arjuna.mw.wstx.war" depends="com.arjuna.mw.wstx.jar">
- <war warfile="${com.arjuna.mwlabs.wstx.webapps.dest}/${com.arjuna.mwlabs.ts.modulename}10.war" webxml="xml/wstx_web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="${com.arjuna.mwlabs.ts.modulename}.jar ${com.arjuna.mwlabs.ts.modulename}10.jar"/>
- </manifest>
- </war>
- <war warfile="${com.arjuna.mwlabs.wstx.webapps.dest}/${com.arjuna.mwlabs.ts.modulename}11.war" webxml="xml/wstx_web-app11.xml">
- <manifest>
- <attribute name="Class-Path" value="${com.arjuna.mwlabs.ts.modulename}.jar ${com.arjuna.mwlabs.ts.modulename}11.jar"/>
- </manifest>
- </war>
+ <war warfile="${com.arjuna.mwlabs.wstx.webapps.dest}/${com.arjuna.mwlabs.ts.modulename}10.war" webxml="xml/wstx_web-app.xml"/>
+ <war warfile="${com.arjuna.mwlabs.wstx.webapps.dest}/${com.arjuna.mwlabs.ts.modulename}11.war" webxml="xml/wstx_web-app11.xml"/>
</target>
<!-- Jar targets -->
@@ -375,16 +367,9 @@
<fileset dir="${com.arjuna.mwlabs.wstx.tests.dest}"/>
</jar>
<war warfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.war" webxml="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app.xml">
- <manifest>
- <attribute name="Class-Path" value="wstx-tests.jar"/>
- </manifest>
<classes dir="${com.arjuna.mwlabs.wstx.tests.dest}"/>
</war>
- <war warfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx11-tests.war" webxml="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app11.xml">
- <manifest>
- <attribute name="Class-Path" value="wstx-tests.jar"/>
- </manifest>
- </war>
+ <war warfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx11-tests.war" webxml="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app11.xml"/>
<ear earfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.ear" appxml="${com.arjuna.mwlabs.wstx.tests.dd}/wstx-tests_application.xml">
<!--
<fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2008-07-21 06:32:32 UTC (rev 21139)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2008-07-21 09:00:39 UTC (rev 21140)
@@ -122,6 +122,7 @@
<!-- unpack all the jar code into the classes directory -->
<!-- this works around a bug in AS 5.0.0.CR1 sar handling -->
+ <!--
<unjar src="${lib.dir}/ws-c.jar" dest="${build.classes.dir}"/>
<unjar src="${lib.dir}/ws-c10.jar" dest="${build.classes.dir}"/>
<unjar src="${lib.dir}/ws-c11.jar" dest="${build.classes.dir}"/>
@@ -136,12 +137,14 @@
<unjar src="${lib.dir}/wstx10.jar" dest="${build.classes.dir}"/>
<unjar src="${lib.dir}/wstx11.jar" dest="${build.classes.dir}"/>
<delete file="${build.classes.dir}/META-INF/MANIFEST.MF"/>
+ -->
<!-- pack everything in the service archive -->
<jar jarfile="${build.dir}/jbossxts.sar">
<!-- include generic 1.0 and 1.1 jars -->
<!--
<fileset dir="${lib.dir}" includes="*.jar"/>
-->
+ <fileset dir="${lib.dir}" includes="*.jar"/>
<!-- include 1.0 and 1.1 web apps all config files are included -->
<fileset dir="${build.dir}" includes="ws-c11.war ws-c10.war ws-t11.war ws-t10.war"/>
More information about the jboss-svn-commits
mailing list