[jboss-cvs] JBossAS SVN: r82439 - in branches/ropalka-jbossws305-jboss501: webservices/src/scripts and 1 other directory.

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

Author: richard.opalka at jboss.com
Date: 2008-12-19 06:03:53 -0500 (Fri, 19 Dec 2008)
New Revision: 82439

Modified:
   branches/ropalka-jbossws305-jboss501/build/build-distr.xml
   branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml
Log:
[JBAS-6195] fixed deploy, lib and common/lib directories (WIP)

Modified: branches/ropalka-jbossws305-jboss501/build/build-distr.xml
===================================================================
--- branches/ropalka-jbossws305-jboss501/build/build-distr.xml	2008-12-19 10:02:18 UTC (rev 82438)
+++ branches/ropalka-jbossws305-jboss501/build/build-distr.xml	2008-12-19 11:03:53 UTC (rev 82439)
@@ -1591,13 +1591,15 @@
     <mkdir dir="${install.all.deployers}/jbossws.deployer"/>
     <unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
 
-    <delete dir="${_module.output}/jbossws-native-resources"/>
+    <delete dir="${_module.output}/jbossws-native-resources"/> <!-- TODO: move to install-jbossws-to-bin ant target -->
     <mkdir dir="${_module.output}/jbossws-native-resources"/>
     <unzip dest="${_module.output}/jbossws-native-resources" src="${org.jboss.ws.native.lib}/jbossws-native-resources.jar"/>
 
     <available classname="java.io.Console" property="BUILT_ON_JDK6_AND_ABOVE"/>
     <antcall target="install-jbossws-to-bin"/>
     <antcall target="install-jbossws-to-endorsed"/>
+    <antcall target="install-jbossws-to-common-lib"/>
+    <antcall target="install-jbossws-to-deploy"/>
 
     <ant antfile="${project.root}/${_module.name}/src/scripts/jbossws-deploy-macros.xml" target="deploy-jbossws-native50" inheritall="false">
       <property name="installserver" value="${install.all}"/>
@@ -1636,6 +1638,31 @@
     </copy>
   </target>
 
+  <target name="install-jbossws-to-common-lib">
+    <!-- Install JBossWS jars to common/lib directory -->
+    <copy todir="${install.common.lib}" flatten="true" overwrite="true">
+      <fileset dir="${project.root}/thirdparty/org/jboss/ws/native/lib/">
+        <include name="jbossws-native-jaxrpc.jar"/>
+        <include name="jbossws-native-jaxws.jar"/>
+        <include name="jbossws-native-jaxws-ext.jar"/>
+        <include name="jbossws-native-saaj.jar"/>
+      </fileset>
+      <fileset dir="${project.root}/thirdparty/org/jboss/ws/lib/">
+        <include name="jbossws-common.jar"/>
+        <include name="jbossws-framework.jar"/>
+        <include name="jbossws-spi.jar"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="install-jbossws-to-deploy">
+    <!-- Install JBossWS web console to deploy directory -->
+    <mkdir dir="${install.all.deploy}/jbossws.sar"/>
+    <unzip
+      src="${project.root}/thirdparty/org/jboss/ws/native/lib/jbossws-native-management.war"
+      dest="${install.all.deploy}/jbossws.sar/jbossws-management.war"/>
+  </target>
+
   <target name="_module-webservices-all" depends="_module-webservices-most">
     <!-- Copy the generated javadocs -->
     <mkdir dir="${install.api}/${_module.name}"/>

Modified: branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml
===================================================================
--- branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml	2008-12-19 10:02:18 UTC (rev 82438)
+++ branches/ropalka-jbossws305-jboss501/webservices/src/scripts/jbossws-deploy-macros.xml	2008-12-19 11:03:53 UTC (rev 82439)
@@ -27,16 +27,6 @@
     <include name="**/wstx.jar"/>
   </patternset>
 
-  <patternset id="jbossws.server.lib.patternset">
-    <include name="**/jbossws-common.jar"/>
-    <include name="**/jbossws-framework.jar"/>
-    <include name="**/jbossws-native-jaxrpc.jar"/>
-    <include name="**/jbossws-native-jaxws.jar"/>
-    <include name="**/jbossws-native-jaxws-ext.jar"/>
-    <include name="**/jbossws-native-saaj.jar"/>
-    <include name="**/jbossws-spi.jar"/>
-  </patternset>
-
   <patternset id="jbossws.service.lib.patternset">
     <include name="**/sun-fi/lib/FastInfoset.jar"/>
     <include name="**/jboss-jaxb-intros.jar"/>
@@ -48,26 +38,6 @@
   </patternset>
 
   <!-- ================================================================== -->
-  <!-- Deploy Lib                                                         -->
-  <!-- ================================================================== -->
-
-  <macrodef name="macro-deploy-jbossws-lib50">
-    <attribute name="thirdpartydir"/>
-    <attribute name="targetdir"/>
-    <sequential>
-      <mkdir dir="@{targetdir}"/>
-      <copy todir="@{targetdir}" flatten="true" overwrite="true">
-        <fileset dir="@{thirdpartydir}">
-          <include name="**/sun-jaxb/lib/jaxb-api.jar"/>
-          <include name="**/jaxb-impl.jar"/>
-          <include name="**/stax-api/lib/stax-api.jar"/>
-          <include name="**/wstx.jar"/>
-        </fileset>
-      </copy>
-    </sequential>
-  </macrodef>
-
-  <!-- ================================================================== -->
   <!-- Deploy Client                                                      -->
   <!-- ================================================================== -->
 
@@ -86,43 +56,6 @@
   </macrodef>
 
   <!-- ================================================================== -->
-  <!-- Deploy Server Lib                                                  -->
-  <!-- ================================================================== -->
-
-  <macrodef name="macro-deploy-jbossws-server-lib50">
-    <attribute name="thirdpartydir"/>
-    <attribute name="targetdir"/>
-    <attribute name="jbossid"/>
-    <sequential>
-      <mkdir dir="@{targetdir}"/>
-      <copy todir="@{targetdir}" flatten="true" overwrite="true">
-        <fileset dir="@{thirdpartydir}">
-          <patternset refid="jbossws.server.lib.patternset"/>
-        </fileset>
-      </copy>
-    </sequential>
-  </macrodef>
-
-  <!-- ================================================================== -->
-  <!-- Deploy JBossWS Service                                             -->
-  <!-- ================================================================== -->
-
-  <macrodef name="macro-deploy-jbossws-sar50">
-    <attribute name="thirdpartydir"/>
-    <attribute name="artifactsdir"/>
-    <attribute name="targetdir"/>
-    <attribute name="jbossid"/>
-    <sequential>
-      <mkdir dir="@{targetdir}"/>
-      <unzip dest="@{targetdir}/jbossws-management.war">
-        <fileset dir="@{thirdpartydir}">
-          <include name="**/jbossws-native-management.war"/>
-        </fileset>
-      </unzip>
-    </sequential>
-  </macrodef>
-
-  <!-- ================================================================== -->
   <!-- Deploy Deployers                                                   -->
   <!-- ================================================================== -->
 
@@ -163,9 +96,6 @@
 
   <target name="deploy-jbossws-native50">
     <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
-    <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
-    <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
-    <macro-deploy-jbossws-sar50 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}"/>
   </target>