[jboss-cvs] build/jboss ...
Ruel Loehr
ruel.loehr at jboss.com
Mon Jul 24 16:06:51 EDT 2006
User: rloehr
Date: 06/07/24 16:06:51
Modified: jboss Tag: Branch_4_0 build-distr.xml
Log:
move webservice distribution to thirdparty target
Revision Changes Path
No revision
No revision
1.1.4.80 +63 -121 build/jboss/build-distr.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build-distr.xml
===================================================================
RCS file: /cvsroot/jboss/build/jboss/build-distr.xml,v
retrieving revision 1.1.4.79
retrieving revision 1.1.4.80
diff -u -b -r1.1.4.79 -r1.1.4.80
--- build-distr.xml 24 Jul 2006 12:19:13 -0000 1.1.4.79
+++ build-distr.xml 24 Jul 2006 20:06:51 -0000 1.1.4.80
@@ -4,7 +4,7 @@
]>
<!--
Build the development distribution
-$Id: build-distr.xml,v 1.1.4.79 2006/07/24 12:19:13 tdiesler Exp $
+$Id: build-distr.xml,v 1.1.4.80 2006/07/24 20:06:51 rloehr Exp $
-->
<project name="JBoss/Build">
@@ -961,98 +961,6 @@
<!-- end of life in jboss-4.0.4 -->
</target>
- <!-- ========== -->
- <!-- Webservice -->
- <!-- ========== -->
-
- <target name="_module-webservice-most" depends="module-webservice14">
- <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.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>
- </copy>
-
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${javassist.javassist.lib}">
- <include name="javassist.jar"/>
- </fileset>
- <fileset dir="${jboss/jbossretro.rt.lib}">
- <include name="jbossretro-rt.jar"/>
- </fileset>
- <fileset dir="${jboss/backport.concurrent.lib}">
- <include name="jboss-backport-concurrent.jar"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="module-webservice14">
- <property name="_module.name" value="webservice" override="true"/>
- <property name="_module.output" value="${project.root}/${_module.name}/output" override="true"/>
-
- <!-- 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.rt.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-webservice-all" depends="_module-webservice-most">
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
<!-- ==== -->
<!-- IIOP -->
<!-- ==== -->
@@ -1478,54 +1386,76 @@
</fileset>
</copy>
+
+ <!-- copy thirdparty items to client dir -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${jboss.remoting.lib}">
<include name="jboss-remoting.jar"/>
</fileset>
- </copy>
- <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.serialization.lib}">
<include name="jboss-serialization.jar"/>
</fileset>
- </copy>
- <copy todir="${install.client}" filtering="no">
+ <fileset dir="${sun.javamail.lib}">
+ <include name="mail.jar"/>
+ </fileset>
<fileset dir="${apache.httpclient.lib}">
<include name="commons-httpclient.jar"/>
</fileset>
- </copy>
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
<fileset dir="${jboss.common.lib}">
<include name="jboss-common-client.jar"/>
<include name="namespace.jar"/>
</fileset>
- </copy>
- <copy todir="${install.client}" filtering="no">
<fileset dir="${jboss.jbossxb.lib}">
<include name="jboss-xml-binding.jar"/>
</fileset>
+ <fileset dir="${jboss.jbossws14.lib}">
+ <include name="jbossws14-client.jar"/>
+ </fileset>
+ <fileset dir="${jboss/jbossretro.rt.lib}">
+ <include name="jbossretro-rt.jar"/>
+ </fileset>
+ <fileset dir="${jboss/backport.concurrent.lib}">
+ <include name="jboss-backport-concurrent.jar"/>
+ </fileset>
</copy>
+ <!-- copy thirdparty items to install/all/lib -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${jboss.remoting.lib}">
<include name="jboss-remoting.jar"/>
</fileset>
- </copy>
- <copy todir="${install.all.lib}" filtering="no">
<fileset dir="${jboss.serialization.lib}">
<include name="jboss-serialization.jar"/>
</fileset>
- </copy>
- <copy todir="${install.all.lib}" filtering="no">
<fileset dir="${jboss.cache.lib}">
<include name="jboss-cache.jar"/>
</fileset>
- </copy>
-
- <!-- Copy thirdparty code to server/all/lib -->
- <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${javassist.javassist.lib}">
+ <include name="javassist.jar"/>
+ </fileset>
+ <fileset dir="${jboss/jbossretro.rt.lib}">
+ <include name="jbossretro-rt.jar"/>
+ </fileset>
+ <fileset dir="${jboss/backport.concurrent.lib}">
+ <include name="jboss-backport-concurrent.jar"/>
+ </fileset>
<fileset dir="${apache.httpclient.lib}">
<include name="commons-httpclient.jar"/>
</fileset>
@@ -1540,6 +1470,18 @@
</fileset>
</copy>
+ <!-- install thirdparty items to install/bin -->
+ <!-- install wstools shell scripts -->
+ <unjar dest="${install.bin}" src="${jboss.jbossws14.lib}/jbossws14-client.jar">
+ <patternset>
+ <include name="wstools.*"/>
+ </patternset>
+ </unjar>
+
+ <!-- create deployments from thirdparty items -->
+ <!-- copy the jbossws14.sar -->
+ <mkdir dir="${install.all.deploy}/jbossws14.sar"/>
+ <unjar dest="${install.all.deploy}/jbossws14.sar" src="${jboss.jbossws14.lib}/jbossws14.sar"/>
</target>
More information about the jboss-cvs-commits
mailing list