[jboss-cvs] Repository SVN: r2732 - in jboss/jbossws/snapshot: lib and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2008-03-12 05:59:22 -0400 (Wed, 12 Mar 2008)
New Revision: 2732

Modified:
   jboss/jbossws/snapshot/bin/jbossws-deploy.conf
   jboss/jbossws/snapshot/lib/jboss-jaxrpc.jar
   jboss/jbossws/snapshot/lib/jboss-jaxws-ext.jar
   jboss/jbossws/snapshot/lib/jboss-jaxws.jar
   jboss/jbossws/snapshot/lib/jboss-saaj.jar
   jboss/jbossws/snapshot/lib/jbossws-client.jar
   jboss/jbossws/snapshot/lib/jbossws-context.war
   jboss/jbossws/snapshot/lib/jbossws-core-src.zip
   jboss/jbossws/snapshot/lib/jbossws-core.jar
   jboss/jbossws/snapshot/resources/jbossws-deploy-macros.xml
Log:
Fix AS42 deployment structure -r5936

Modified: jboss/jbossws/snapshot/bin/jbossws-deploy.conf
===================================================================
--- jboss/jbossws/snapshot/bin/jbossws-deploy.conf	2008-03-12 09:17:43 UTC (rev 2731)
+++ jboss/jbossws/snapshot/bin/jbossws-deploy.conf	2008-03-12 09:59:22 UTC (rev 2732)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-api.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar client/wstx.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar
\ No newline at end of file

Modified: jboss/jbossws/snapshot/lib/jboss-jaxrpc.jar
===================================================================
(Binary files differ)

Modified: jboss/jbossws/snapshot/lib/jboss-jaxws-ext.jar
===================================================================
(Binary files differ)

Modified: jboss/jbossws/snapshot/lib/jboss-jaxws.jar
===================================================================
(Binary files differ)

Modified: jboss/jbossws/snapshot/lib/jboss-saaj.jar
===================================================================
(Binary files differ)

Modified: jboss/jbossws/snapshot/lib/jbossws-client.jar
===================================================================
(Binary files differ)

Modified: jboss/jbossws/snapshot/lib/jbossws-context.war
===================================================================
(Binary files differ)

Modified: jboss/jbossws/snapshot/lib/jbossws-core-src.zip
===================================================================
(Binary files differ)

Modified: jboss/jbossws/snapshot/lib/jbossws-core.jar
===================================================================
(Binary files differ)

Modified: jboss/jbossws/snapshot/resources/jbossws-deploy-macros.xml
===================================================================
--- jboss/jbossws/snapshot/resources/jbossws-deploy-macros.xml	2008-03-12 09:17:43 UTC (rev 2731)
+++ jboss/jbossws/snapshot/resources/jbossws-deploy-macros.xml	2008-03-12 09:59:22 UTC (rev 2732)
@@ -14,8 +14,9 @@
 <project>
   
   <!-- 
-  These patterns should be common for all supported containers 
-  Exceptions must be defined in the individual deploy macros.
+    These patterns should be common for all supported containers.
+    All jars must also be declared in component-info.xml to ensure 
+    that the AS build uses the same version.
   -->
   <patternset id="jbossws.bin.patternset">
     <include name="**/wsconsume.bat"/>
@@ -43,9 +44,11 @@
     <include name="**/jboss-jaxws-ext.jar"/>
     <include name="**/jboss-saaj.jar"/>
     <include name="**/policy.jar"/>
+    <include name="**/stax-api.jar"/>
     <include name="**/stax-ex.jar"/>
     <include name="**/streambuffer.jar"/>
     <include name="**/wsdl4j.jar"/>
+    <include name="**/wstx.jar"/>
   </patternset>
   
   <patternset id="jbossws.lib.patternset">
@@ -178,6 +181,10 @@
         <fileset dir="@{thirdpartydir}">
           <patternset refid="jbossws.service.lib.patternset"/>
           <include name="**/jbossws-deploy.conf"/>
+          <include name="**/jaxb-api.jar"/>
+          <include name="**/jaxb-impl.jar"/>
+          <include name="**/stax-api.jar"/>
+          <include name="**/wstx.jar"/>
         </fileset>
       </copy>
       <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
@@ -259,13 +266,20 @@
   <!-- ================================================================== -->
   
   <macrodef name="macro-undeploy-jbossws">
+    <attribute name="defaultconf"/>
     <attribute name="targetdir"/>
     <sequential>
-      <loadfile property="jbossws.undeploy.files" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
-      <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
+      <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+      <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+      
+      <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/>
+      <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/>
+      <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/>
+      
       <delete>
-        <fileset dir="@{targetdir}/../../../.." includes="${jbossws.undeploy.files}"/>
+        <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/>
       </delete>
+      <delete dir="@{targetdir}"/>
     </sequential>
   </macrodef>