[jbossws-commits] JBossWS SVN: r3380 - in trunk: build/hudson/hudson-home/jobs/Distro-Native-AS-4.2 and 14 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Jun 1 15:21:31 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-01 15:21:31 -0400 (Fri, 01 Jun 2007)
New Revision: 3380
Added:
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-bin-dist.xml
Removed:
trunk/integration/native/ant-import/build-distro.xml
trunk/integration/sunri/ant-import/build-distro.xml
trunk/integration/xfire/ant-import/build-distro.xml
Modified:
trunk/build/ant-import/build-release.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/integration/native/build.xml
trunk/integration/native/src/main/etc/bindist-build.xml
trunk/integration/sunri/build.xml
trunk/integration/sunri/src/main/etc/bindist-build.xml
trunk/integration/xfire/build.xml
trunk/integration/xfire/src/main/etc/bindist-build.xml
Log:
Fix build-bin-dist
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/ant-import/build-release.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -13,9 +13,6 @@
<project>
- <property name="build.bin.dist" value="${build.output.dir}/bin-dist"/>
- <property name="build.src.dist" value="${build.output.dir}/src-dist"/>
-
<target name="release-all" depends="all,release-to-repository,release-to-portal" description="Release JBossWS">
<echo message="*********************************************"/>
<echo message="* Released: jbossws-${version.id}"/>
@@ -76,137 +73,19 @@
<!-- Build distributions -->
<!-- ================================================================== -->
- <!-- Build the bin dist -->
- <target name="build-bin-dist" depends="jars,build-samples,build-javadoc"
- description="Build the binary distribution">
-
- <property name="install.bin.dir" value="${build.bin.dist}/install/bin"/>
- <property name="install.etc.dir" value="${build.bin.dist}/install/etc"/>
- <property name="install.core.dir" value="${build.bin.dist}/install/jbossws-core"/>
- <property name="install.jboss40.dir" value="${build.bin.dist}/install/integration-jboss40"/>
- <property name="install.jboss42.dir" value="${build.bin.dist}/install/integration-jboss42"/>
- <property name="install.jboss50.dir" value="${build.bin.dist}/install/integration-jboss50"/>
- <property name="install.tomcat.dir" value="${build.bin.dist}/install/integration-tomcat"/>
- <property name="install.thirdparty.dir" value="${build.bin.dist}/install/thirdparty"/>
-
- <mkdir dir="${install.etc.dir}"/>
- <mkdir dir="${install.core.dir}"/>
- <mkdir dir="${install.jboss40.dir}"/>
- <mkdir dir="${install.jboss42.dir}"/>
- <mkdir dir="${install.jboss50.dir}"/>
- <mkdir dir="${install.tomcat.dir}"/>
- <mkdir dir="${install.thirdparty.dir}"/>
-
- <copy todir="${build.bin.dist}" file="${build.etc.dir}/JBossORG-EULA.txt" overwrite="true"/>
- <copy todir="${build.bin.dist}" filtering="true" overwrite="true">
- <fileset dir="${build.dir}/dist"/>
- <filterset>
- <filtersfile file="${build.dir}/version.properties"/>
- </filterset>
- </copy>
- <copy tofile="${build.bin.dist}/build.xml" file="${build.dir}/ant-import/build-deploy.xml"/>
-
- <!-- samples -->
- <copy todir="${build.bin.dist}" file="${build.output.dir}/${samples.target}.zip" overwrite="true"/>
-
- <!-- javadoc -->
- <copy todir="${build.bin.dist}" file="${build.output.dir}/jbossws-${version.id}-api.zip" overwrite="true"/>
-
- <!-- bin -->
- <copy todir="${install.bin.dir}">
- <fileset dir="${build.etc.dir}">
- <include name="*.bat"/>
- <include name="*.sh"/>
- </fileset>
- </copy>
-
- <!-- etc -->
- <copy todir="${install.etc.dir}">
- <fileset dir="${build.etc.dir}">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- Install Core -->
- <copy todir="${install.core.dir}" overwrite="true">
- <fileset dir="${core.output.lib.dir}">
- <include name="jbossws-client.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
-
- <!-- Install Thirdparty -->
- <copy todir="${install.thirdparty.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="activation.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="jaxb-*.jar"/>
- <include name="juddi-service.sar"/>
- <include name="mail.jar"/>
- <include name="serializer.jar"/>
- <include name="stax-api.jar"/>
- <include name="wstx.jar"/>
- <include name="xalan.jar"/>
- <include name="xercesImpl.jar"/>
- </fileset>
- </copy>
-
- <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50.sar"/>
- <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/>
- <copy todir="${install.jboss42.dir}" file="${jboss42.output.lib.dir}/jbossws42.sar"/>
- <copy todir="${install.jboss40.dir}">
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40.sar"/>
- <include name="jbossws40-jdk14.sar"/>
- <include name="jbossws14-client.jar"/>
- <include name="jboss-jaxws14.jar"/>
- </fileset>
- </copy>
-
- <!-- Install Tomcat -->
- <copy todir="${install.tomcat.dir}" overwrite="true">
- <fileset dir="${tomcat.output.lib.dir}">
- <include name="jbossws-tomcat-integration.jar"/>
- <include name="jbossws-thirdparty.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.tomcat.dir}" overwrite="true">
- <fileset dir="${tomcat.output.lib.dir}" includes="jbossws.war"/>
- </copy>
-
- <zip destfile="${build.output.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/>
- </target>
-
<!-- Build the src dist -->
<target name="build-src-dist" description="Build the source distribution">
+ <property name="build.src.dist" value="${build.dir}/output/src-dist"/>
+ <delete dir="${build.src.dist}/jbossws-src-${version.id}"/>
<mkdir dir="${build.src.dist}/jbossws-src-${version.id}"/>
<copy todir="${build.src.dist}/jbossws-src-${version.id}">
- <fileset dir="${basedir}/..">
- <include name="build/ant.properties.example"/>
- <include name="build/version.properties"/>
- <include name="build/build.xml"/>
- <include name="build/ant-import/**"/>
- <include name="build/etc/**"/>
- <include name="jbossws-core/src/**"/>
- <include name="jbossws-core/build.xml"/>
- <include name="jbossws-docs/user-guide/**"/>
- <include name="jbossws-tests/ant-import/**"/>
- <include name="jbossws-tests/src/**"/>
- <include name="jbossws-tests/build.xml"/>
- <include name="integration-jboss50/src/**"/>
- <include name="integration-jboss50/build.xml"/>
- <include name="integration-jboss42/src/**"/>
- <include name="integration-jboss42/build.xml"/>
- <include name="integration-jboss40/src/**"/>
- <include name="integration-jboss40/build.xml"/>
- <include name="integration-tomcat/src/**"/>
- <include name="integration-tomcat/build.xml"/>
+ <fileset dir="${basedir}">
+ <exclude name="*.md5"/>
+ <exclude name="**/output*/**"/>
+ <exclude name="**/thirdparty/**"/>
</fileset>
</copy>
- <zip destfile="${build.output.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}"
+ <zip destfile="${build.dir}/output/jbossws-src-${version.id}.zip" basedir="${build.src.dist}"
includes="jbossws-src-${version.id}/**"/>
</target>
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -32,7 +32,7 @@
# Build distro
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT binary-dist
+ant $ENVIRONMENT build-bin-dist
#
# Deploy distro
Copied: trunk/integration/native/ant-import/build-bin-dist.xml (from rev 3378, trunk/integration/native/ant-import/build-distro.xml)
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml (rev 0)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/XFire -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars" description="Build the binary distribution">
+
+ <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/>
+ <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/ant-import">
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${spi.dir}/ant-import">
+ <include name="macros-deploy-spi.xml"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/ant-import">
+ <include name="macros-deploy-xfire.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${spi.dir}/output/lib">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-core.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-native42.sar"/>
+ <include name="jbossws-native50.sar"/>
+ <include name="jbossws-native50-deployer.zip"/>
+ </fileset>
+ <fileset dir="${core.dir}/thirdparty">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="juddi-service.sar"/>
+ <include name="policy.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}/src"/>
+ <fileset dir="${int.native.dir}/src/test"/>
+ </copy>
+
+ <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip">
+ <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Deleted: trunk/integration/native/ant-import/build-distro.xml
===================================================================
--- trunk/integration/native/ant-import/build-distro.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/native/ant-import/build-distro.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Binary distribution JBossWS/XFire -->
- <!-- ================================================================== -->
-
- <target name="binary-dist" depends="jars" description="Build the binary distribution">
-
- <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
- <filterset>
- <filtersfile file="${build.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/>
- <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${build.dir}">
- <include name="version.properties"/>
- </fileset>
- <fileset dir="${build.dir}/ant-import">
- <include name="build-testsuite.xml"/>
- </fileset>
- <fileset dir="${int.native.dir}/ant-import">
- <include name="macros-deploy-native.xml"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/ant-import">
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- <fileset dir="${spi.dir}/ant-import">
- <include name="macros-deploy-spi.xml"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/ant-import">
- <include name="macros-deploy-xfire.xml"/>
- </fileset>
- <fileset dir="${testsuite.dir}/ant-import">
- <include name="build-jars-jaxws.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${build.dir}/etc">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
- <include name="getopt.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="${int.native.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-native42.sar"/>
- <include name="jbossws-native50.sar"/>
- <include name="jbossws-native50-deployer.zip"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="juddi-service.sar"/>
- <include name="policy.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${testsuite.dir}/src"/>
- <fileset dir="${int.native.dir}/src/test"/>
- </copy>
-
- <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip">
- <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/>
- </zip>
- </target>
-
-</project>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/native/build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -15,8 +15,8 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${int.native.dir}/ant-import/build-bin-dist.xml"/>
<import file="${int.native.dir}/ant-import/build-deploy.xml"/>
- <import file="${int.native.dir}/ant-import/build-distro.xml"/>
<import file="${int.native.dir}/ant-import/build-release.xml"/>
<import file="${int.native.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.native.dir}/ant-import/build-thirdparty.xml"/>
@@ -231,6 +231,6 @@
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
+ <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
</project>
Modified: trunk/integration/native/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -21,7 +21,7 @@
<property name="bin.dir" value="${basedir}/bin"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
@@ -138,13 +138,14 @@
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
</target>
<!-- Remove jbossws/native from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
<macro-undeploy-native50/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy jbossws/native to jboss42 -->
@@ -157,16 +158,18 @@
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
- <macro-deploy-spi
+
+ <macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
</target>
<!-- Remove jbossws/native from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
<macro-undeploy-native42/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
<!-- ================================================================== -->
Copied: trunk/integration/sunri/ant-import/build-bin-dist.xml (from rev 3378, trunk/integration/sunri/ant-import/build-distro.xml)
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml (rev 0)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/SunRI -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars" description="Build the binary distribution">
+
+ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+
+ <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/>
+ <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/ant-import">
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${spi.dir}/ant-import">
+ <include name="macros-deploy-spi.xml"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/ant-import">
+ <include name="macros-deploy-xfire.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${spi.dir}/output/lib">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-sunri42.sar"/>
+ <include name="jbossws-sunri50.sar"/>
+ <include name="jbossws-sunri50-deployer.zip"/>
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/thirdparty"/>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}/src"/>
+ <fileset dir="${int.sunri.dir}/src/test"/>
+ </copy>
+
+ <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip">
+ <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Deleted: trunk/integration/sunri/ant-import/build-distro.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Binary distribution JBossWS/SunRI -->
- <!-- ================================================================== -->
-
- <target name="binary-dist" depends="jars" description="Build the binary distribution">
-
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
-
- <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
- <filterset>
- <filtersfile file="${build.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/>
- <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${build.dir}">
- <include name="version.properties"/>
- </fileset>
- <fileset dir="${build.dir}/ant-import">
- <include name="build-testsuite.xml"/>
- </fileset>
- <fileset dir="${int.native.dir}/ant-import">
- <include name="macros-deploy-native.xml"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/ant-import">
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- <fileset dir="${spi.dir}/ant-import">
- <include name="macros-deploy-spi.xml"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/ant-import">
- <include name="macros-deploy-xfire.xml"/>
- </fileset>
- <fileset dir="${testsuite.dir}/ant-import">
- <include name="build-jars-jaxws.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${build.dir}/etc">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
- <include name="getopt.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-sunri42.sar"/>
- <include name="jbossws-sunri50.sar"/>
- <include name="jbossws-sunri50-deployer.zip"/>
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/thirdparty"/>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${testsuite.dir}/src"/>
- <fileset dir="${int.sunri.dir}/src/test"/>
- </copy>
-
- <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip">
- <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/>
- </zip>
- </target>
-
-</project>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/sunri/build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -15,8 +15,8 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${int.sunri.dir}/ant-import/build-bin-dist.xml"/>
<import file="${int.sunri.dir}/ant-import/build-deploy.xml"/>
- <import file="${int.sunri.dir}/ant-import/build-distro.xml"/>
<import file="${int.sunri.dir}/ant-import/build-release.xml"/>
<import file="${int.sunri.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.sunri.dir}/ant-import/build-thirdparty.xml"/>
@@ -255,6 +255,6 @@
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
+ <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
</project>
Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -20,7 +20,7 @@
<property name="build.dir" value="${basedir}/build"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
@@ -145,13 +145,14 @@
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
</target>
<!-- Remove jbossws/sunri from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
<macro-undeploy-sunri50/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy jbossws/sunri to jboss42 -->
@@ -167,13 +168,14 @@
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${build.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
</target>
<!-- Remove jbossws/sunri from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
<macro-undeploy-sunri42/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
<!-- ================================================================== -->
Copied: trunk/integration/xfire/ant-import/build-bin-dist.xml (from rev 3378, trunk/integration/xfire/ant-import/build-distro.xml)
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml (rev 0)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/XFire -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars" description="Build the binary distribution">
+
+ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/>
+
+ <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.lib.dir}/thirdparty/client"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
+ <filterset>
+ <filtersfile file="${build.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/>
+ <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/ant-import">
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${spi.dir}/ant-import">
+ <include name="macros-deploy-spi.xml"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/ant-import">
+ <include name="macros-deploy-xfire.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${spi.dir}/output/lib">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-xfire42.sar"/>
+ <include name="jbossws-xfire50.sar"/>
+ <include name="jbossws-xfire50-deployer.zip"/>
+ </fileset>
+
+ <!-- TODO: Verify this doesnt clash -->
+ <fileset dir="${int.xfire.dir}/thirdparty"/>
+ <fileset dir="${int.sunri.dir}/thirdparty"/>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}/src"/>
+ <fileset dir="${int.xfire.dir}/src/test"/>
+ </copy>
+
+ <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip">
+ <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Deleted: trunk/integration/xfire/ant-import/build-distro.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-distro.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/xfire/ant-import/build-distro.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Binary distribution JBossWS/XFire -->
- <!-- ================================================================== -->
-
- <target name="binary-dist" depends="jars" description="Build the binary distribution">
-
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/>
-
- <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.lib.dir}/thirdparty/client"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example">
- <filterset>
- <filtersfile file="${build.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/>
- <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${build.dir}">
- <include name="version.properties"/>
- </fileset>
- <fileset dir="${build.dir}/ant-import">
- <include name="build-testsuite.xml"/>
- </fileset>
- <fileset dir="${int.native.dir}/ant-import">
- <include name="macros-deploy-native.xml"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/ant-import">
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- <fileset dir="${spi.dir}/ant-import">
- <include name="macros-deploy-spi.xml"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/ant-import">
- <include name="macros-deploy-xfire.xml"/>
- </fileset>
- <fileset dir="${testsuite.dir}/ant-import">
- <include name="build-jars-jaxws.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${build.dir}/etc">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
- <include name="getopt.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-xfire42.sar"/>
- <include name="jbossws-xfire50.sar"/>
- <include name="jbossws-xfire50-deployer.zip"/>
- </fileset>
-
- <!-- TODO: Verify this doesnt clash -->
- <fileset dir="${int.xfire.dir}/thirdparty"/>
- <fileset dir="${int.sunri.dir}/thirdparty"/>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${testsuite.dir}/src"/>
- <fileset dir="${int.xfire.dir}/src/test"/>
- </copy>
-
- <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip">
- <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/>
- </zip>
- </target>
-
-</project>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/xfire/build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -15,8 +15,8 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${int.xfire.dir}/ant-import/build-bin-dist.xml"/>
<import file="${int.xfire.dir}/ant-import/build-deploy.xml"/>
- <import file="${int.xfire.dir}/ant-import/build-distro.xml"/>
<import file="${int.xfire.dir}/ant-import/build-release.xml"/>
<import file="${int.xfire.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.xfire.dir}/ant-import/build-thirdparty.xml"/>
@@ -241,6 +241,6 @@
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,binary-dist"/>
+ <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
</project>
Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 18:40:32 UTC (rev 3379)
+++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 19:21:31 UTC (rev 3380)
@@ -21,7 +21,7 @@
<property name="bin.dir" value="${basedir}/bin"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
+ <property name="thirdparty.dir" value="${basedir}/lib"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
@@ -161,16 +161,18 @@
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
+
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss50.home}"/>
</target>
<!-- Remove jbossws/xfire from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
<macro-undeploy-xfire50/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy jbossws/xfire to jboss42 -->
@@ -182,16 +184,18 @@
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
+
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ jbosshome="${jboss42.home}"/>
</target>
<!-- Remove jbossws/xfire from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
<macro-undeploy-xfire42/>
- <macro-undeploy-spi/>
+ <macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
<!-- ================================================================== -->
More information about the jbossws-commits
mailing list