[jbossws-commits] JBossWS SVN: r7622 - in stack/cxf/trunk: src/main/distro and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-06-18 03:09:42 -0400 (Wed, 18 Jun 2008)
New Revision: 7622

Modified:
   stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/cxf/trunk/src/main/distro/build-deploy.xml
Log:
[JBWS-2231] fix deploy macros

Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-06-18 06:53:44 UTC (rev 7621)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-06-18 07:09:42 UTC (rev 7622)
@@ -217,13 +217,14 @@
   <!-- ================================================================== -->
   
   <macrodef name="macro-deploy-jbossws-cxf42-sar">
+    <attribute name="thirdpartydir"/>
     <attribute name="artifactsdir"/>
     <attribute name="targetdir"/>
     <attribute name="jbossid"/>
     <sequential>
       <mkdir dir="@{targetdir}"/>
       <copy todir="@{targetdir}" flatten="true">
-        <fileset dir="@{artifactsdir}/lib">
+        <fileset dir="@{thirdpartydir}">
           <patternset refid="jbossws.service.lib.patternset"/>
           <include name="**/jaxb-api.jar"/>
           <include name="**/jaxb-impl.jar"/>
@@ -232,7 +233,7 @@
         </fileset>
       </copy>
       <unzip dest="@{targetdir}/jbossws-management.war">
-        <fileset dir="@{artifactsdir}/lib">
+        <fileset dir="@{thirdpartydir}">
           <include name="**/jbossws-cxf-management.war"/>
         </fileset>
       </unzip>
@@ -251,18 +252,19 @@
   </macrodef>
   
   <macrodef name="macro-deploy-jbossws-cxf50-sar">
+    <attribute name="thirdpartydir"/>
     <attribute name="artifactsdir"/>
     <attribute name="targetdir"/>
     <attribute name="jbossid"/>
     <sequential>
       <mkdir dir="@{targetdir}"/>
       <copy todir="@{targetdir}" flatten="true" overwrite="true">
-        <fileset dir="@{artifactsdir}/lib">
+        <fileset dir="@{thirdpartydir}">
           <patternset refid="jbossws.service.lib.patternset"/>
         </fileset>
       </copy>
       <unzip dest="@{targetdir}/jbossws-management.war">
-        <fileset dir="@{artifactsdir}/lib">
+        <fileset dir="@{thirdpartydir}">
           <include name="**/jbossws-cxf-management.war"/>
         </fileset>
       </unzip>
@@ -279,13 +281,14 @@
   <!-- ================================================================== -->
   
   <macrodef name="macro-deploy-jbossws-deployers50">
+    <attribute name="thirdpartydir"/>
     <attribute name="artifactsdir"/>
     <attribute name="targetdir"/>
     <attribute name="jbossid"/>
     <sequential>
       <mkdir dir="@{targetdir}"/>
       <copy todir="@{targetdir}" flatten="true" overwrite="true">
-        <fileset dir="@{artifactsdir}/lib">
+        <fileset dir="@{thirdpartydir}">
           <include name="**/jbossws-common.jar"/>
           <include name="**/jbossws-framework.jar"/>
           <include name="**/jbossws-@{jbossid}.jar"/>
@@ -308,13 +311,11 @@
     <attribute name="targetdir"/>
     <attribute name="jbossid"/>
     <sequential>
-      <mkdir dir="@{targetdir}"/>
-      <unzip dest="@{targetdir}/jbossws.sar" src="@{thirdpartydir}/jbossws-@{jbossid}-container.jar">
-        <patternset>
-          <include name="META-INF/jbossws-container-beans.xml"/>
-        </patternset>
-      </unzip>
-      <move file="@{targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml" todir="@{targetdir}"/>
+      <copy todir="@{targetdir}" flatten="true" overwrite="true">
+        <fileset dir="@{thirdpartydir}">
+          <include name="**/jbossws-@{jbossid}-container.jar"/>
+        </fileset>
+      </copy>
     </sequential>
   </macrodef>
   
@@ -326,25 +327,31 @@
   <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
   
   <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed">
+    <fail message="installserver must be specified" unless="installserver"/>
+    <fail message="artifactsdir must be specified" unless="artifactsdir"/>
+    <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
     <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
-    <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
-    <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/>
-    <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
-    <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
+    <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+    <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+    <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+    <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
   </target>
   
   <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed">
+    <fail message="installserver must be specified" unless="installserver"/>
+    <fail message="artifactsdir must be specified" unless="artifactsdir"/>
+    <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
     <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
-    <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
-    <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/>
-    <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
-    <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
-    <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
-    <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/>
+    <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+    <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+    <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+    <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+    <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+    <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
   </target>
   
   <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
-    <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/>
+    <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
   </target>
   
   <!-- ================================================================== -->

Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml	2008-06-18 06:53:44 UTC (rev 7621)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml	2008-06-18 07:09:42 UTC (rev 7622)
@@ -23,6 +23,7 @@
       <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
       <param name="jbossid" value="${jbossws.integration.target}"/>
       <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+      <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
     </antcall>
     <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
   </target>
@@ -81,6 +82,7 @@
       <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
       <param name="jbossid" value="${jbossws.integration.target}"/>
       <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+      <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
     </antcall>
     <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
   </target>