[jboss-cvs] JBossAS SVN: r57682 - trunk/build

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

Author: scott.stark at jboss.org
Date: 2006-10-15 01:56:43 -0400 (Sun, 15 Oct 2006)
New Revision: 57682

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
Log:
Remove the jbossretro dependency and the webservices14 target


Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-10-15 05:45:52 UTC (rev 57681)
+++ trunk/build/build-distr.xml	2006-10-15 05:56:43 UTC (rev 57682)
@@ -1288,7 +1288,7 @@
   <!-- Webservice -->
   <!-- ========== -->
 
-  <target name="_module-webservice-most" depends="module-webservice14, module-webservice15">
+  <target name="_module-webservice-most" depends="module-webservice15">
     <property name="_module.name" value="webservice" override="true"/>
     <property name="_module.output" value="${project.root}/${_module.name}/output" override="true"/>
 
@@ -1300,34 +1300,6 @@
 
    </target>
 
-  <target name="module-webservice14" unless="HAVE_JDK_1.5">
-
-    <!-- copy the client stuff -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${jboss.jbossws14.lib}">
-        <include name="jbossws14-client.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>
-
-    <!-- copy the jbossws14.sar -->
-    <mkdir dir="${install.all.deploy}/jbossws14.sar"/>
-    <unjar dest="${install.all.deploy}/jbossws14.sar" src="${jboss.jbossws14.lib}/jbossws14.sar"/>
-
-    <!-- install wstools shell scripts -->
-    <unjar dest="${install.bin}" src="${jboss.jbossws14.lib}/jbossws14-client.jar">
-      <patternset>
-        <include name="wstools.*"/>
-      </patternset>
-    </unjar>
-  </target>
-
   <target name="module-webservice15" if="HAVE_JDK_1.5">
 
     <!-- copy the client stuff -->
@@ -1741,9 +1713,6 @@
        <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>

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2006-10-15 05:45:52 UTC (rev 57681)
+++ trunk/build/build-thirdparty.xml	2006-10-15 05:56:43 UTC (rev 57682)
@@ -92,7 +92,6 @@
       <componentref name="jboss/common-logging-jdk" version="2.0.1.GA"/>
       <componentref name="jboss/common-logging-spi" version="2.0.1.GA"/>
       <componentref name="jboss/jbossxb" version="1.0.0.CR6"/>
-      <componentref name="jboss/jbossretro" version="1.0.3.GA"/>
       <componentref name="jboss/jbossws14" version="1.0.2.GA"/>
       <componentref name="jboss/jbossws" version="1.0.2.GA"/>
       <componentref name="jboss/messaging" version="snapshot"/>