[jbossws-commits] JBossWS SVN: r3219 - in trunk: integration/jbws/ant-import and 3 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed May 23 11:14:01 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-05-23 11:14:01 -0400 (Wed, 23 May 2007)
New Revision: 3219
Added:
trunk/build/etc/bindist.properties
trunk/integration/jbws/ant-import/macros-deploy-jbws.xml
trunk/integration/sunri/ant-import/build-distribution.xml
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
trunk/integration/sunri/src/main/etc/bindist-build.xml
Modified:
trunk/integration/jbws/ant-import/build-deploy.xml
trunk/integration/sunri/ant-import/build-deploy.xml
trunk/integration/sunri/build.xml
Log:
Start bin-dist
Added: trunk/build/etc/bindist.properties
===================================================================
--- trunk/build/etc/bindist.properties (rev 0)
+++ trunk/build/etc/bindist.properties 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,24 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler at jboss.com $
+
+# Optional JBoss Home
+jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
+jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
+
+# The JBoss server under test. This can be [jboss50|jboss42]
+jbossws.integration.target=jboss50
+
+# The JBoss server instance
+jboss.server.instance=default
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=yes
+javac.fail.onerror=yes
+javac.verbose=no
Modified: trunk/integration/jbws/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-23 14:52:07 UTC (rev 3218)
+++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -13,159 +13,42 @@
<project>
+ <import file="${int.jbws.dir}/ant-import/macros-deploy-jbws.xml"/>
+
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
<!-- ================================================================== -->
<!-- Deploy jbossws to jboss50 -->
- <target name="deploy-jboss50" depends="jars-jbws50,undeploy-jboss50" description="Deploy jbossws to jboss50">
-
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.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"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws.output.lib.dir}/jbossws-jbws50-deployer.zip"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws50.sar"/>
- <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/>
- <!-- Deploy juddi-service.sar -->
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${core.dir}/thirdparty/juddi-service.sar"/>
+ <target name="deploy-jboss50" depends="jars-jbws50" description="Deploy jbossws to jboss50">
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <macro-deploy-jbws50
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss50.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ jbwslibs="${int.jbws.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
</target>
<!-- Remove jbossws from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50">
-
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
-
- <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
-
- <delete>
- <fileset dir="${jboss50.home}/client">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
- <!-- Undeploy juddi-service.sar -->
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <macro-undeploy-jbws50/>
</target>
<!-- Deploy jbossws to jboss42 -->
- <target name="deploy-jboss42" depends="jars-jbws42,undeploy-jboss42" description="Deploy jbossws to jboss42">
-
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
-
- <copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/lib" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws42.sar"/>
- <!-- Deploy juddi-service.sar -->
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${core.dir}/thirdparty/juddi-service.sar"/>
+ <target name="deploy-jboss42" depends="jars-jbws42" description="Deploy jbossws to jboss42">
+ <macro-deploy-jbws42
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss42.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ jbwslibs="${int.jbws.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
</target>
<!-- Remove jbossws from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42">
-
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
-
- <delete>
- <fileset dir="${jboss42.home}/client">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/lib">
- <include name="jbossws-integration.jar"/> <!-- The old integration jar-->
- </fileset>
- <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <!-- Undeploy juddi-service.sar -->
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <macro-undeploy-jbws42/>
</target>
</project>
Added: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml
===================================================================
--- trunk/integration/jbws/ant-import/macros-deploy-jbws.xml (rev 0)
+++ trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,176 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBossWS/Native -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbws50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="jbwslibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{jbwslibs}/jbossws-jbws50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{jbwslibs}/jbossws-jbws50.sar"/>
+ <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbws42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="jbwslibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{jbwslibs}/jbossws-jbws42.sar"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-jbws50">
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <delete>
+ <fileset dir="${jboss50.home}/client">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-jbws42">
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <delete>
+ <fileset dir="${jboss42.home}/client">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/lib">
+ <include name="jbossws-integration.jar"/> <!-- The old integration jar-->
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+</project>
Property changes on: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 14:52:07 UTC (rev 3218)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -13,50 +13,26 @@
<project>
+ <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
+
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
<!-- ================================================================== -->
<!-- Deploy jbossws/sunri to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50">
-
<ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
-
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="${sunri.output.lib.dir}/jbossws-sunri50.sar"/>
- <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${sunri.output.lib.dir}/jbossws-context.war" overwrite="true"/>
+ <macro-deploy-sunri50
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss50.dir}/output/lib"
+ sunrilibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
</target>
<!-- Remove jbossws/sunri from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <macro-undeploy-sunri50/>
</target>
</project>
Added: trunk/integration/sunri/ant-import/build-distribution.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-distribution.xml (rev 0)
+++ trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,97 @@
+<?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">
+
+ <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/>
+ <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.lib.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/>
+ <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.jbws.dir}/ant-import">
+ <include name="macros-deploy-jbws.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="build-thirdparty.xml"/>
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- 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="${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"/>
+ </fileset>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}">
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+
+ <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip">
+ <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Property changes on: trunk/integration/sunri/ant-import/build-distribution.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml (rev 0)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,66 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss50 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="sunrilibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{sunrilibs}/jbossws-sunri50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{sunrilibs}/jbossws-sunri50.sar"/>
+ <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{sunrilibs}/jbossws-context.war" overwrite="true"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss50 -->
+ <macrodef name="macro-undeploy-sunri50">
+ <sequential>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ </sequential>
+ </macrodef>
+
+</project>
Property changes on: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-05-23 14:52:07 UTC (rev 3218)
+++ trunk/integration/sunri/build.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -16,6 +16,7 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
<import file="${int.sunri.dir}/ant-import/build-deploy.xml"/>
+ <import file="${int.sunri.dir}/ant-import/build-distribution.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"/>
Added: trunk/integration/sunri/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bindist-build.xml (rev 0)
+++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,119 @@
+<?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 default="main" basedir="." name="JBossWS/SunRI">
+
+ <import file="${basedir}/build/build-deploy.xml"/>
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/build-thirdparty.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="tests-init" depends="tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="tests-main"/>
+
+ <target name="all" description="Create a distribution zip file" depends="most">
+ </target>
+
+</project>
Property changes on: trunk/integration/sunri/src/main/etc/bindist-build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jbossws-commits
mailing list