[Jboss-cvs] JBossAS SVN: r56069 - in trunk: . build tools/lib

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

Author: ruel.loehr at jboss.com
Date: 2006-08-18 11:56:21 -0400 (Fri, 18 Aug 2006)
New Revision: 56069

Removed:
   trunk/webservice/
Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
   trunk/tools/lib/jbossbuild.jar
Log:
cleanup webservice remnants in build, move webservice distribution to thirdparty target, new jbossbuild with bugfix for classpath creation

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-08-18 15:26:21 UTC (rev 56068)
+++ trunk/build/build-distr.xml	2006-08-18 15:56:21 UTC (rev 56069)
@@ -1274,47 +1274,8 @@
 
     <!-- copy common client stuff -->
     <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${sun.jaf.lib}">
-        <include name="activation.jar"/>
-      </fileset>
-      <fileset dir="${apache.logging.lib}">
-        <include name="commons-logging.jar"/>
-      </fileset>
-      <fileset dir="${apache.xmlsec.lib}">
-        <include name="xmlsec.jar"/>
-      </fileset>
-      <fileset dir="${ibm.wsdl4j.lib}">
-        <include name="wsdl4j.jar"/>
-      </fileset>
-      <fileset dir="${javassist.javassist.lib}">
-        <include name="javassist.jar"/>
-      </fileset>
-      <fileset dir="${jboss.remoting.lib}">
-        <include name="jboss-remoting.jar"/>
-      </fileset>
-      <fileset dir="${jboss.serialization.lib}">
-        <include name="jboss-serialization.jar"/>
-      </fileset>
-      <fileset dir="${sun.javamail.lib}">
-        <include name="mail.jar"/>
-      </fileset>
-      <fileset dir="${sun.jaxb.lib}">
-        <include name="jaxb-api.jar"/>
-        <include name="jaxb-impl.jar"/>
-      </fileset>
-    </copy>
 
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${javassist.javassist.lib}">
-        <include name="javassist.jar"/>
-      </fileset>
-      <fileset dir="${jboss.jbossretro.lib}">
-        <include name="jbossretro-rt.jar"/>
-      </fileset>
-      <fileset dir="${jboss/backport.concurrent.lib}">
-        <include name="jboss-backport-concurrent.jar"/>
-      </fileset>
     </copy>
 
    </target>
@@ -1352,21 +1313,8 @@
     <!-- copy the client stuff -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
-      <fileset dir="${jboss.jbossws.lib}">
-        <include name="jbossws-client.jar"/>
-      </fileset>
     </copy>
 
-    <!-- unjar the jbossws.sar -->
-    <mkdir dir="${install.all.deploy}/jbossws.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.lib}/jbossws.sar"/>
-
-    <!-- install wstools shell scripts -->
-    <unjar dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
-      <patternset>
-        <include name="wstools.*"/>
-      </patternset>
-    </unjar>
   </target>
 
   <target name="_module-webservice-all" depends="_module-webservice-most">
@@ -1770,6 +1718,15 @@
         <fileset dir="${jboss.cache.lib}">
            <include name="jboss-cache-jdk50.jar"/>
         </fileset>
+       <fileset dir="${javassist.javassist.lib}">
+         <include name="javassist.jar"/>
+       </fileset>
+       <fileset dir="${jboss.jbossretro.lib}">
+         <include name="jbossretro-rt.jar"/>
+       </fileset>
+       <fileset dir="${jboss.backport.concurrent.lib}">
+         <include name="jboss-backport-concurrent.jar"/>
+       </fileset>
      </copy>
 
 
@@ -1800,6 +1757,37 @@
       <fileset dir="${jboss.jbossxb.lib}">
         <include name="jboss-xml-binding.jar"/>
       </fileset>
+      <fileset dir="${sun.jaf.lib}">
+        <include name="activation.jar"/>
+      </fileset>
+      <fileset dir="${apache.logging.lib}">
+        <include name="commons-logging.jar"/>
+      </fileset>
+      <fileset dir="${apache.xmlsec.lib}">
+        <include name="xmlsec.jar"/>
+      </fileset>
+      <fileset dir="${ibm.wsdl4j.lib}">
+        <include name="wsdl4j.jar"/>
+      </fileset>
+      <fileset dir="${javassist.javassist.lib}">
+        <include name="javassist.jar"/>
+      </fileset>
+      <fileset dir="${jboss.remoting.lib}">
+        <include name="jboss-remoting.jar"/>
+      </fileset>
+      <fileset dir="${jboss.serialization.lib}">
+        <include name="jboss-serialization.jar"/>
+      </fileset>
+      <fileset dir="${sun.javamail.lib}">
+        <include name="mail.jar"/>
+      </fileset>
+      <fileset dir="${sun.jaxb.lib}">
+        <include name="jaxb-api.jar"/>
+        <include name="jaxb-impl.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jbossws.lib}">
+        <include name="jbossws-client.jar"/>
+      </fileset>
     </copy>
 
     <!-- Copy thirdparty code -->
@@ -1833,6 +1821,17 @@
     </copy>
 
 
+     <!-- setup webservice sar -->
+    <mkdir dir="${install.all.deploy}/jbossws.sar"/>
+    <unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.lib}/jbossws.sar"/>
+
+    <!-- install wstools shell scripts -->
+    <unjar dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
+      <patternset>
+        <include name="wstools.*"/>
+      </patternset>
+    </unjar>
+ 
   </target>
 
 </project>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2006-08-18 15:26:21 UTC (rev 56068)
+++ trunk/build/build.xml	2006-08-18 15:56:21 UTC (rev 56069)
@@ -108,7 +108,6 @@
       <module name="system"/>
       <module name="testsuite"/>
       <module name="varia"/>
-      <module name="webservice"/>
       <module name="tomcat"/>
       <module name="transaction"/>
 
@@ -149,8 +148,7 @@
 			  ejb3,
                           tomcat,
                           hibernate-int,
-                          console,
-                          webservice
+                          console
                           "/>
       </group>
 
@@ -559,18 +557,7 @@
      <ant antfile="build-distr.xml" target="_module-tomcat-all"/>
   </target>
 
-  <!-- ========== -->
-  <!-- Webservice -->
-  <!-- ========== -->
 
-  <target name="_module-webservice-most">
-     <ant antfile="build-distr.xml" target="_module-webservice-most"/>
-  </target>
-
-  <target name="_module-webservice-all" depends="_module-webservice-most">
-     <ant antfile="build-distr.xml" target="_module-webservice-all"/>
-  </target>
-
   <!-- ==== -->
   <!-- IIOP -->
   <!-- ==== -->

Modified: trunk/tools/lib/jbossbuild.jar
===================================================================
(Binary files differ)