[jboss-svn-commits] JBL Code SVN: r37271 - in labs/jbosstm/trunk/XTS: WS-T and 2 other directories.

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

Author: adinn
Date: 2011-07-20 06:44:47 -0400 (Wed, 20 Jul 2011)
New Revision: 37271

Modified:
   labs/jbosstm/trunk/XTS/WS-C/build.xml
   labs/jbosstm/trunk/XTS/WS-T/build.xml
   labs/jbosstm/trunk/XTS/sar/META-INF/module.xml
   labs/jbosstm/trunk/XTS/sar/build.xml
Log:
modified build scripts to place JaxWS SEI classes in XTS uber-jar so they can be deloyed using the new  EndpointPublisher service. also added annotations package to module list so @Resource annotations are not lost -- fixes for JBTM-848

Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml	2011-07-19 19:29:37 UTC (rev 37270)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml	2011-07-20 10:44:47 UTC (rev 37271)
@@ -179,7 +179,7 @@
     <target name="jars11">
         <copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/ws-c_handlers.xml"/>
         <jar jarfile="${build.lib.dir}/ws-c11.jar">
-            <fileset dir="${build.classes11.dir}" excludes="${ws-c11.coordinator.endpoint.classes}"/>
+            <fileset dir="${build.classes11.dir}"/>
         </jar>
     </target>
 
@@ -192,7 +192,7 @@
         </jar>
         <copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/ws-c_handlers.xml"/>
         <jar jarfile="${build.lib.dir}/ws-c11.jar">
-            <fileset dir="${build.classes11.dir}" excludes="${ws-c11.coordinator.endpoint.classes}"/>
+            <fileset dir="${build.classes11.dir}"/>
         </jar>
     </target>
 
@@ -206,7 +206,6 @@
     <target name="webapps11" depends="jars11" >
         <copy file="${dd.dir}/ws-c11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml"/>
         <war warfile="${build.webapps.dir}/ws-c11.war" webxml="${build.dd.dir}/web-app11.xml" manifest="${dd.dir}/manifest.mf">
-            <classes dir="${build.classes11.dir}" includes="${ws-c11.coordinator.endpoint.classes}" />
         </war>
     </target>
 

Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml	2011-07-19 19:29:37 UTC (rev 37270)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml	2011-07-20 10:44:47 UTC (rev 37271)
@@ -303,7 +303,7 @@
         <copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/ws-t_handlers.xml"/>
         <copy file="${dd.dir}/ws-t-rpc_handlers.xml" tofile="${build.classes11.dir}/ws-t-rpc_handlers.xml"/>
         <jar jarfile="${build.lib.dir}/ws-t11.jar">
-            <fileset dir="${build.classes11.dir}" excludes="${ws-t11.api.classes} ${ws-t11.coordinator.endpoint.classes} ${ws-t11.participant.endpoint.classes} ${ws-t11.client.endpoint.classes}"/>
+            <fileset dir="${build.classes11.dir}" excludes="${ws-t11.api.classes}"/>
         </jar>
         <jar jarfile="${build.lib.dir}/ws-t11-api.jar">
             <fileset dir="${build.classes11.dir}" includes="${ws-t11.api.classes}"/>
@@ -323,15 +323,12 @@
         <copy file="${dd.dir}/ws-t11-client_web-app.xml" tofile="${build.dd.dir}/web-app11-client.xml"/>
         <!-- coordinator  -->
         <war warfile="${build.webapps.dir}/ws-t11-coordinator.war" webxml="${build.dd.dir}/web-app11-coordinator.xml" manifest="${dd.dir}/manifest.mf">
-            <classes dir="${build.classes11.dir}" includes="${ws-t11.coordinator.endpoint.classes}"/>
         </war>
         <!-- participants  -->
         <war warfile="${build.webapps.dir}/ws-t11-participant.war" webxml="${build.dd.dir}/web-app11-participant.xml" manifest="${dd.dir}/manifest.mf">
-            <classes dir="${build.classes11.dir}" includes="${ws-t11.participant.endpoint.classes}"/>
         </war>
         <!-- client  -->
         <war warfile="${build.webapps.dir}/ws-t11-client.war" webxml="${build.dd.dir}/web-app11-client.xml" manifest="${dd.dir}/manifest.mf">
-            <classes dir="${build.classes11.dir}" includes="${ws-t11.client.endpoint.classes}"/>
         </war>
     </target>
 

Modified: labs/jbosstm/trunk/XTS/sar/META-INF/module.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/module.xml	2011-07-19 19:29:37 UTC (rev 37270)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/module.xml	2011-07-20 10:44:47 UTC (rev 37271)
@@ -70,5 +70,9 @@
             found in a deployment gets this package auto-added to its module loader
             -->
         <module name="javax.jws.api"/>
+        <!-- this is needed to ensure @Resource annotations are visible -->
+        <module name="javax.annotation.api"/>
+        <!-- need this so we can access HTTPServletRequest etc -->
+        <module name="javax.servlet.api"/>
     </dependencies>
 </module>

Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml	2011-07-19 19:29:37 UTC (rev 37270)
+++ labs/jbosstm/trunk/XTS/sar/build.xml	2011-07-20 10:44:47 UTC (rev 37271)
@@ -212,9 +212,6 @@
         <unjar src="${lib.dir}/recovery.jar" dest="${build.dir}/tmp/impl"/>
         <unjar src="${lib.dir}/service.jar" dest="${build.dir}/tmp/impl"/>
         <unjar src="${lib.dir}/config.jar" dest="${build.dir}/tmp/impl"/>
-        <copy todir="${build.dir}/tmp/impl">
-            <fileset dir="${webapps.dir}" includes="*.war"/>
-        </copy>
         <jar file="${build.dir}/jbossxts.jar" basedir="${build.dir}/tmp/impl"/>
         <copy file="${build.dir}/jbossxts.jar" tofile="${lib.dir}/jbossxts.jar"/>
         <delete dir="${build.dir}/tmp/impl"/>
@@ -235,9 +232,6 @@
         <unjar src="${lib.dir}/recovery.jar" dest="${build.dir}/tmp/impl"/>
         <unjar src="${lib.dir}/service.jar" dest="${build.dir}/tmp/impl"/>
         <unjar src="${lib.dir}/config.jar" dest="${build.dir}/tmp/impl"/>
-        <copy todir="${build.dir}/tmp/impl">
-            <fileset dir="${webapps.dir}" includes="*.war"/>
-        </copy>
         <jar file="${build.dir}/jbossxts.jar" basedir="${build.dir}/tmp/impl"/>
         <copy file="${build.dir}/jbossxts.jar" tofile="${lib.dir}/jbossxts.jar"/>
         <delete dir="${build.dir}/tmp/impl"/>