[jbossws-commits] JBossWS SVN: r5921 - in stack/native/trunk: ant-import and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Mar 11 15:42:39 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-03-11 15:42:39 -0400 (Tue, 11 Mar 2008)
New Revision: 5921
Added:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/build-prepare-deploy.xml
Removed:
stack/native/trunk/ant-import/build-deploy42.xml
stack/native/trunk/ant-import/build-deploy50.xml
stack/native/trunk/src/main/distro/bin-dist-deploy.xml
Modified:
stack/native/trunk/ant-import/build-bin-dist.xml
stack/native/trunk/ant-import/build-release.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
stack/native/trunk/build.xml
stack/native/trunk/src/main/distro/ant.properties.example
stack/native/trunk/src/main/distro/bin-dist-build.xml
Log:
Reuse deployment scripts in bin-dist
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -17,39 +17,38 @@
<!-- Binary distribution -->
<!-- ================================================================== -->
- <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution">
+ <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution">
<property name="bindist.dir" value="${core.output.dir}/jbossws-native-dist"/>
<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.deploy.dir" value="${bindist.dir}/deploy"/>
<property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
<property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
<property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
<delete dir="${bindist.dir}"/>
<mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.deploy.dir}"/>
<mkdir dir="${bindist.docs.dir}"/>
<mkdir dir="${bindist.tests.dir}"/>
<mkdir dir="${bindist.tools.dir}"/>
<!-- root -->
- <copy tofile="${bindist.dir}/ant.properties.example" file="${core.distro.dir}/ant.properties.example">
+ <copy file="${core.distro.dir}/ant.properties.example" todir="${bindist.dir}">
<filterset>
<filtersfile file="${core.dir}/ant.properties"/>
</filterset>
</copy>
<copy tofile="${bindist.dir}/version.properties" file="${core.dir}/version.properties"/>
<copy tofile="${bindist.dir}/build.xml" file="${core.distro.dir}/bin-dist-build.xml"/>
- <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${core.distro.dir}/bin-dist-deploy.xml"/>
<copy tofile="${bindist.build.dir}/build-project-gen.xml" file="${core.distro.dir}/bin-dist-project-gen.xml"/>
<!-- build -->
<copy todir="${bindist.build.dir}">
<fileset dir="${core.dir}/ant-import">
- <include name="jbossws.default.undeploy.files"/>
- <include name="macros-deploy-native.xml"/>
+ <include name="build-deploy.xml"/>
+ <include name="jbossws-deploy-macros.xml"/>
+ <include name="jbossws-default-deploy.conf"/>
</fileset>
<fileset dir="${core.distro.dir}">
<include name="user-project-build.xml"/>
@@ -58,17 +57,11 @@
</fileset>
</copy>
- <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${core.dir}/src/main/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
+ <!-- deploy -->
+ <copy todir="${bindist.deploy.dir}">
+ <fileset dir="${deploy.artifacts.dir}"/>
</copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
<!-- docs -->
<copy todir="${bindist.docs.dir}">
<fileset dir="${core.output.dir}">
@@ -91,48 +84,6 @@
</fileset>
</copy>
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-framework-scripts.zip"/>
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-jboss421.jar"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jbossws-core-scripts.zip"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-native40.sar"/>
- <include name="jbossws-native42.sar"/>
- <include name="jbossws-native50.sar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="getopt.jar"/>
- <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="jboss-xml-binding.jar"/>
- <include name="juddi-service.sar"/>
- <include name="policy.jar"/>
- <include name="stax-api.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="wstx.jar"/>
- </fileset>
- </copy>
-
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
<fileset dir="${core.dir}/src/test-framework"/>
Copied: stack/native/trunk/ant-import/build-deploy.xml (from rev 5920, stack/native/trunk/ant-import/build-deploy50.xml)
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml (rev 0)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -0,0 +1,154 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss42" depends="prepare-deploy">
+
+ <!-- Create the deployment structure -->
+ <antcall target="deploy-jbossws-native42" inheritall="false">
+ <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/>
+ <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset" dir="${deploy.structure.jboss42}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="${deploy.structure.jboss42}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss421 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss421" depends="undeploy-jboss421,deploy-structure-jboss42" description="Deploy jbossws to jboss421">
+ <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
+ <copy todir="${jboss421.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss42}"/>
+ </copy>
+ <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- Extras for jboss-4.2.1 -->
+ <copy todir="${jboss421.home}/lib" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss421.home}/client" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
+ <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <copy todir="${jboss422.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss42}"/>
+ </copy>
+ <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss42}"/>
+ </copy>
+ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-5.0.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
+
+ <!-- Create the deployment structure -->
+ <antcall target="deploy-jbossws-native50" inheritall="false">
+ <param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset" dir="${deploy.structure.jboss50}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="${deploy.structure.jboss50}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <copy todir="${jboss500.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss50}"/>
+ </copy>
+ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss50}"/>
+ </copy>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+</project>
Deleted: stack/native/trunk/ant-import/build-deploy42.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -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>
-
- <import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
-
- <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss421 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss421" depends="undeploy-jboss421,prepare-deploy42" description="Deploy jbossws to jboss421">
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
- <copy todir="${jboss421.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- Extras for jboss-4.2.1 -->
- <copy todir="${jboss421.home}/lib" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss421.home}/client" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
- </target>
-
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
- <macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss422" depends="undeploy-jboss422,prepare-deploy42" description="Deploy jbossws to jboss422">
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <copy todir="${jboss422.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss423" depends="undeploy-jboss423,prepare-deploy42" description="Deploy jbossws to jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <copy todir="${jboss423.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Prepare Deployment JBoss-4.2.x -->
- <!-- ================================================================== -->
-
- <target name="prepare-deploy42" depends="jars">
-
- <delete dir="${core.output.deploy.dir}-src"/>
- <delete dir="${core.output.deploy.dir}"/>
-
- <!-- Copy all artifacts to a flat deploy src -->
- <unzip dest="${core.output.deploy.dir}-src/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
- <unzip dest="${core.output.deploy.dir}-src/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/>
- <copy todir="${core.output.deploy.dir}-src/lib">
- <fileset dir="${thirdparty.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- <fileset dir="${core.output.lib.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="jbossws-context.war"/>
- </fileset>
- </copy>
- <copy todir="${core.output.deploy.dir}-src/resources">
- <fileset dir="${core.output.resources.dir}">
- <include name="standard-*-config.xml"/>
- <include name="jbossws-native42-beans.xml"/>
- </fileset>
- </copy>
-
- <!-- Create the deployment structure -->
- <antcall target="deploy-jbossws-native42" inheritall="false">
- <param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/>
- <param name="resourcesdir" value="${core.output.resources.dir}/jbossws-jboss42.sar"/>
- <param name="thirdpartydir" value="${core.output.deploy.dir}-src"/>
- </antcall>
-
- <!-- Create jbossws-deploy.conf -->
- <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws-deploy.conf,**/jbossws.sar/**"/>
- <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
- </target>
-
-</project>
Deleted: stack/native/trunk/ant-import/build-deploy50.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -1,104 +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>
-
- <import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/>
-
- <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss500" depends="undeploy-jboss500,prepare-deploy50" description="Deploy jbossws to jboss500">
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <copy todir="${jboss500.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <target name="deploy-jboss501" depends="undeploy-jboss501,prepare-deploy50" description="Deploy jbossws to jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <copy todir="${jboss501.home}" overwrite="true">
- <fileset dir="${core.output.deploy.dir}" excludes="jbossws-deploy.conf"/>
- </copy>
- <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Prepare Deployment JBoss-5.0.x -->
- <!-- ================================================================== -->
-
- <target name="prepare-deploy50" depends="jars">
-
- <delete dir="${core.output.deploy.dir}-src"/>
- <delete dir="${core.output.deploy.dir}"/>
-
- <!-- Copy all artifacts to a flat deploy src -->
- <unzip dest="${core.output.deploy.dir}-src/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
- <unzip dest="${core.output.deploy.dir}-src/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/>
- <copy todir="${core.output.deploy.dir}-src/lib">
- <fileset dir="${thirdparty.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- <fileset dir="${core.output.lib.dir}">
- <patternset refid="jbossws.client.patternset"/>
- <patternset refid="jbossws.lib.patternset"/>
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <patternset refid="jbossws.server.lib.patternset"/>
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="jbossws-context.war"/>
- </fileset>
- </copy>
- <copy todir="${core.output.deploy.dir}-src/resources">
- <fileset dir="${core.output.resources.dir}">
- <include name="standard-*-config.xml"/>
- <include name="jbossws-native50-beans.xml"/>
- </fileset>
- </copy>
-
- <!-- Create the deployment structure -->
- <antcall target="deploy-jbossws-native50" inheritall="false">
- <param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/>
- <param name="thirdpartydir" value="${core.output.deploy.dir}-src"/>
- </antcall>
-
- <!-- Create jbossws-deploy.conf -->
- <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws-deploy.conf,**/jbossws.sar/**"/>
- <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
- </target>
-
-</project>
Added: stack/native/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-prepare-deploy.xml (rev 0)
+++ stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -0,0 +1,53 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Source -->
+ <!-- ================================================================== -->
+
+ <target name="prepare-deploy" depends="jars">
+
+ <delete dir="${deploy.artifacts.dir}"/>
+
+ <unzip dest="${deploy.artifacts.dir}/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+ <unzip dest="${deploy.artifacts.dir}/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/>
+ <copy todir="${deploy.artifacts.dir}/lib">
+ <fileset dir="${thirdparty.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ <fileset dir="${core.output.lib.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="jbossws-context.war"/>
+ </fileset>
+ </copy>
+ <copy todir="${deploy.artifacts.dir}/resources">
+ <fileset dir="${core.output.resources.dir}">
+ <include name="standard-*-config.xml"/>
+ <include name="jbossws-native42-beans.xml"/>
+ <include name="jbossws-native50-beans.xml"/>
+ <include name="jbossws-jboss42.sar/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
Property changes on: stack/native/trunk/ant-import/build-prepare-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/build-release.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -35,7 +35,7 @@
<echo message="*********************************************"/>
</target>
- <target name="release-to-repository" depends="prepare-deploy50,check-svn-externals,warn-svn-externals"
+ <target name="release-to-repository" depends="deploy-structure-jboss50,check-svn-externals,warn-svn-externals"
description="Release to jboss.local.repository">
<!-- jboss/jbossws-native -->
@@ -50,7 +50,7 @@
<include name="wstools.bat"/>
<include name="wstools.sh"/>
</fileset>
- <fileset dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar">
+ <fileset dir="${deploy.structure.jboss50}/server/${jboss.server.instance}/deploy/jbossws.sar">
<include name="jbossws-deploy.conf"/>
</fileset>
</copy>
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -259,12 +259,13 @@
<!-- ================================================================== -->
<macrodef name="macro-undeploy-jbossws">
+ <attribute name="defaultconf"/>
<attribute name="targetdir"/>
<sequential>
- <loadfile property="jbossws.undeploy.files" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
<delete>
- <fileset dir="@{targetdir}/../../../.." includes="${jbossws.undeploy.files}"/>
+ <fileset dir="@{targetdir}/../../../.." includes="${jbossws.deploy.conf}"/>
</delete>
</sequential>
</macrodef>
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/build.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -93,12 +93,13 @@
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-deploy42.xml"/>
- <import file="${basedir}/ant-import/build-deploy50.xml"/>
+ <import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-deploy.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
-
+ <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
+
<property name="core.src.dir" value="${core.dir}/src/main"/>
<property name="core.etc.dir" value="${core.src.dir}/etc"/>
<property name="core.distro.dir" value="${core.src.dir}/distro"/>
@@ -113,6 +114,11 @@
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
<property name="core.output.resources.dir" value="${core.output.dir}/resources"/>
+ <property name="deploy.artifacts.dir" value="${core.output.deploy.dir}-artifacts"/>
+ <property name="deploy.structure.jboss42" value="${core.output.deploy.dir}-jboss42"/>
+ <property name="deploy.structure.jboss50" value="${core.output.deploy.dir}-jboss50"/>
+ <property name="jbossws.default.deploy.conf" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
+
<target name="init" depends="prepare,thirdparty">
</target>
Modified: stack/native/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/src/main/distro/ant.properties.example 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2008-03-11 19:42:39 UTC (rev 5921)
@@ -8,8 +8,9 @@
jboss422.home=@jboss422.home@
jboss423.home=@jboss423.home@
jboss500.home=@jboss500.home@
+jboss501.home=@jboss501.home@
-# The JBoss server under test. This can be [jboss421|jboss422|jboss423|jboss500]
+# The JBoss server under test. This can be [jboss421|jboss422|jboss423|jboss500|jboss501]
jbossws.integration.target=jboss422
# The JBoss settings
Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -18,15 +18,15 @@
<!-- ================================================================== -->
<property name="build.dir" value="${basedir}/build"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="deploy.dir" value="${basedir}/output/deploy"/>
<property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/deploy"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${basedir}/output"/>
- <property name="jbossws.default.undeploy.files" value="${build.dir}/jbossws.default.undeploy.files"/>
+ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
+ <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/>
+ <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
@@ -99,7 +99,7 @@
<import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-project-gen.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/jbossws-deploy-macros.xml"/>
<import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
<!-- ================================================================== -->
@@ -127,13 +127,13 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${lib.dir}/jbossws-common.jar"/>
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${lib.dir}/jboss-jaxws.jar"/>
- <pathelement location="${lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${lib.dir}/jbossws-core.jar"/>
- <pathelement location="${lib.dir}/jbossws-client.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-core.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-client.jar"/>
</path>
<path id="tests.extra.classpath">
@@ -168,9 +168,10 @@
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
- <!-- dummy jar targets -->
+ <!-- dummy targets -->
<target name="jars-jboss50" depends="prepare"/>
<target name="jars-jboss42" depends="prepare"/>
+ <target name="prepare-deploy" depends="prepare"/>
<!-- ================================================================== -->
<!-- Miscellaneous -->
Deleted: stack/native/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-03-11 15:32:31 UTC (rev 5920)
+++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-03-11 19:42:39 UTC (rev 5921)
@@ -1,84 +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: bin-dist-deploy.xml 3576 2007-06-14 09:23:52Z thomas.diesler at jboss.com $ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss421 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss421 -->
- <target name="deploy-jboss421" depends="undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws/native to jboss421">
- <macro-deploy-native421 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws/native from jboss421">
- <macro-undeploy-native421/>
- </target>
-
- <!-- Deploy jbossws/native to jboss422 -->
- <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/native to jboss422">
- <macro-deploy-native422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/native from jboss422">
- <macro-undeploy-native422/>
- </target>
-
- <!-- Deploy jbossws/native to jboss423 -->
- <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/native to jboss423">
- <macro-deploy-native423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/native from jboss423">
- <macro-undeploy-native423/>
- </target>
-
- <!-- Deploy jbossws/native to jboss50 -->
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/native to jboss500">
- <macro-deploy-native500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/native from jboss500">
- <macro-undeploy-native500/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/native to jboss501 -->
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/native to jboss501">
- <macro-deploy-native501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
- <macro-undeploy-native501/>
- </target>
-
-</project>
More information about the jbossws-commits
mailing list