[jboss-cvs] JBossAS SVN: r70758 - trunk/build.

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

Author: thomas.diesler at jboss.com
Date: 2008-03-12 03:54:34 -0400 (Wed, 12 Mar 2008)
New Revision: 70758

Modified:
   trunk/build/build-distr.xml
Log:
Restore 70743 it was ok, update your repository

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-03-12 04:58:30 UTC (rev 70757)
+++ trunk/build/build-distr.xml	2008-03-12 07:54:34 UTC (rev 70758)
@@ -1285,27 +1285,12 @@
   <!-- Webservice -->
   <!-- ========== -->
 
-  <target name="_module-webservice-most" depends="module-webservice15">
+  <target name="_module-webservice-most">
     <property name="_module.name" value="webservice" override="true"/>
     <property name="_module.output" value="${project.root}/${_module.name}/output" override="true"/>
 
-    <!-- copy common client stuff -->
-    <mkdir dir="${install.client}"/>
-
-    <copy todir="${install.all.lib}" filtering="no">
-    </copy>
-
   </target>
 
-  <target name="module-webservice15" if="HAVE_JDK_1.5">
-
-    <!-- copy the client stuff -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-    </copy>
-
-  </target>
-
   <target name="_module-webservice-all" depends="_module-webservice-most">
   </target>
 
@@ -1572,25 +1557,6 @@
     <property name="_module.name" value="webservices" override="true"/>
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
-    <!-- Install jbossws tools shell scripts -->
-    <copy todir="${install.bin}">
-      <fileset dir="${jboss.jbossws.root}/bin">
-        <include name="wstools.*"/>
-        <include name="wsrunclient.*"/>
-      </fileset>
-    </copy>
-  <!--
-
- Temporarily commented, breaks build - ALR
-
-  <unzip dest="${install.bin}" src="${jboss.jbossws.framework.lib}/jbossws-framework-scripts.zip">
-      <patternset>
-        <include name="wsprovide.*"/>
-        <include name="wsconsume.*"/>
-      </patternset>
-    </unzip>
--->
-
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
@@ -1599,14 +1565,15 @@
       </fileset>
     </copy>
     
-    <!-- Install jbossws.deployer -->
+    <!-- Install jbossws.deployer, which is stack agnostic but container dependent -->
     <mkdir dir="${install.all.deployers}/jbossws.deployer"/>
     <unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
 
-    <!-- Install jbossws.sar -->
-    <mkdir dir="${install.all.deploy}/jbossws.sar/jbossws-context.war"/>
-    <unjar dest="${install.all.deploy}/jbossws.sar" src="${_module.output}/lib/jbossws.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws.sar/jbossws-context.war" src="${jboss.jbossws.lib}/jbossws-context.war"/>
+    <!-- Delegate to the jbossws deploy macros for stack specific deployments -->
+    <ant antfile="${jboss.jbossws.resources}/jbossws-deploy-macros.xml" target="deploy-jbossws-native50" inheritall="false">
+      <property name="installserver" value="${install.all}"/>
+      <property name="thirdpartydir" value="${project.thirdparty}"/>
+    </ant>
 
   </target>
 
@@ -1864,25 +1831,9 @@
       <fileset dir="${jboss.jboss.security.spi.lib}">
         <include name="jboss-security-spi.jar"/>
       </fileset>
-      <fileset dir="${jboss.jbossws.common.lib}">
-        <include name="jbossws-common.jar"/>
-      </fileset>
       <fileset dir="${jboss.jnp.client.lib}">
         <include name="jnp-client.jar"/>
       </fileset>
-      <fileset dir="${jboss.jbossws.framework.lib}">
-        <include name="jbossws-framework.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.spi.lib}">
-        <include name="jbossws-spi.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.lib}">
-        <include name="jbossws-client.jar"/>
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-jaxws.jar"/>
-        <include name="jboss-jaxws-ext.jar"/>
-        <include name="jboss-saaj.jar"/>
-      </fileset>
       <fileset dir="${jboss.jbossxb.lib}">
         <include name="jboss-xml-binding.jar"/>
       </fileset>
@@ -1953,9 +1904,6 @@
         <include name="xalan.jar"/>
         <include name="serializer.jar"/>
       </fileset>
-        <fileset dir="${sun.jaxb.lib}">
-          <include name="jaxb-api.jar"/>
-        </fileset>
     </copy>
 
     <!-- Copy thirdparty code to server/all/lib -->
@@ -1984,15 +1932,6 @@
       <fileset dir="${jboss.jboss.javaee.lib}">
         <include name="jboss-javaee.jar"/>
       </fileset>
-      <fileset dir="${jboss.jbossws.spi.lib}">
-        <include name="jbossws-spi.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossws.lib}">
-        <include name="jboss-jaxrpc.jar"/>
-        <include name="jboss-jaxws.jar"/>
-        <include name="jboss-jaxws-ext.jar"/>
-        <include name="jboss-saaj.jar"/>
-      </fileset>
       <fileset dir="${jboss.jnpserver.lib}">
         <include name="jnpserver.jar"/>
       </fileset>