Author: thomas.diesler(a)jboss.com Date: 2007-03-02 06:24:21 -0500 (Fri, 02 Mar 2007) New Revision: 2500 Added: tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml tags/jbossws-1.2.0.GA/build/dist/ tags/jbossws-1.2.0.GA/build/dist/ant.properties.example Removed: tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist/ tags/jbossws-1.2.0.GA/jbossws-docs/ Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml tags/jbossws-1.2.0.GA/integration-jboss40/build.xml tags/jbossws-1.2.0.GA/integration-jboss42/build.xml tags/jbossws-1.2.0.GA/integration-jboss50/build.xml tags/jbossws-1.2.0.GA/integration-tomcat/build.xml Log: Add install script. Remove jbossws-docs Added: tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml =================================================================== --- tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml (rev 0) +++ tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml 2007-03-02 11:24:21 UTC (rev 2500) @@ -0,0 +1,333 @@ +<?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 name="JBossWS-Deploy"> + + <target name="prepare"> + <property file="ant.properties"/> + + <property name="etc.dir" value="install/etc"/> + <property name="core.output.lib.dir" value="install/jbossws-core"/> + <property name="jboss40.output.lib.dir" value="install/integration-jboss40"/> + <property name="jboss42.output.lib.dir" value="install/integration-jboss42"/> + <property name="jboss50.output.lib.dir" value="install/integration-jboss50"/> + <property name="tomcat.output.lib.dir" value="install/integration-tomcat"/> + <property name="tomcat.resources.dir" value="install/integration-tomcat"/> + <property name="thirdparty.dir" value="install/thirdparty"/> + + <property name="jboss50.available.file" value="${jboss50.home}/client/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.home}/client/jboss-client.jar"/> + <property name="jboss40.available.file" value="${jboss40.home}/client/jboss-client.jar"/> + <property name="tomcat.available.file" value="${tomcat.home}/server/lib/catalina.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + <available property="jboss40.available" file="${jboss40.available.file}"/> + <available property="tomcat.available" file="${tomcat.available.file}"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss50 --> + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws"> + + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> + <!-- The JBossAS testsuite references jbossws from thirdparty --> + <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws-jboss50-integration.jar"/> + </fileset> + </copy> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/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="${thirdparty.dir}/juddi-service.sar"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss42 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss42 --> + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws"> + + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + + <copy todir="${jboss42.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> + <!-- The JBossAS testsuite references jbossws from thirdparty --> + <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws-jboss42-integration.jar"/> + </fileset> + </copy> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/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="${thirdparty.dir}/juddi-service.sar"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss40 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss40 --> + <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws"> + + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + + <copy todir="${jboss40.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat" /> + <include name="*.sh" /> + </fileset> + </copy> + <delete file="${jboss40.home}/client/jbossws14-client.jar" /> + <copy todir="${jboss40.home}/client" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar" /> + <include name="jboss-jaxws.jar" /> + <include name="jboss-saaj.jar" /> + <include name="jbossws-client.jar" /> + </fileset> + <!-- Only available on jdk1.5 --> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar" /> + <include name="jaxb-impl.jar" /> + <include name="jaxb-xjc.jar" /> + <include name="jbossws-wsconsume-impl.jar" /> + </fileset> + </copy> + <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar" /> + <include name="jboss-jaxws.jar" /> + <include name="jboss-saaj.jar" /> + </fileset> + </copy> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" /> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" /> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" /> + <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar" /> + <!-- The JBossAS testsuite references jbossws from thirdparty --> + <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar" /> + <include name="jbossws-core.jar" /> + <include name="jboss-jaxrpc.jar" /> + <include name="jboss-jaxws.jar" /> + <include name="jboss-saaj.jar" /> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws-jboss40-integration.jar" /> + </fileset> + </copy> + <!-- Copy jboss-xml-binding.jar --> + <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> + <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> + <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" /> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" /> + <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar" /> + </target> + + <!-- Deploy jbossws to jboss40 jdk1.4 --> + <target name="deploy-jboss40-jdk14" depends="prepare" description="Deploy jbossws"> + + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + + <copy todir="${jboss40.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat" /> + <include name="*.sh" /> + </fileset> + </copy> + <delete file="${jboss40.home}/client/jbossws-client.jar" /> + <copy todir="${jboss40.home}/client" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar" /> + <include name="jboss-saaj.jar" /> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws14-client.jar" /> + </fileset> + </copy> + <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar" /> + <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar" /> + <include name="jboss-saaj.jar" /> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jboss-jaxws14.jar" /> + </fileset> + </copy> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" /> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" /> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" /> + <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" /> + <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws14/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar" /> + <include name="jboss-saaj.jar" /> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws14-client.jar" /> + <include name="jbossws14-core.jar" /> + <include name="jbossws14-jboss40-integration.jar" /> + </fileset> + </copy> + <!-- Copy jboss-xml-binding.jar --> + <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> + <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> + <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" /> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" /> + <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar" /> + </target> + + <!-- ================================================================== --> + <!-- Deployment Tomcat --> + <!-- ================================================================== --> + + <!-- Deploy to Tomcat --> + <target name="deploy-tomcat" depends="prepare" description="Deploy to Tomcat"> + + <fail message="Not available: ${tomcat.available.file}" unless="tomcat.available"/> + + <property name="tomcat.conf.dir" value="${tomcat.home}/conf"/> + <property name="tomcat.common.dir" value="${tomcat.home}/common"/> + <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/> + <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/> + <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> + + <copy todir="${tomcat.common.dir}/endorsed"> + <fileset dir="${thirdparty.dir}"> + <include name="serializer.jar"/> + <include name="xalan.jar"/> + <include name="xercesImpl.jar"/> + </fileset> + </copy> + <copy todir="${tomcat.conf.dir}" overwrite="true"> + <fileset dir="${tomcat.resources.dir}"> + <include name="tomcat-users.xml"/> + </fileset> + </copy> + <copy todir="${tomcat.common.classes}" overwrite="true"> + <fileset dir="${tomcat.resources.dir}"> + <include name="log4j.xml"/> + </fileset> + </copy> + <copy todir="${tomcat.common.lib}" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${tomcat.output.lib.dir}"> + <include name="jbossws-tomcat-integration.jar"/> + <include name="jbossws-thirdparty.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="activation.jar"/> + <include name="log4j.jar"/> + <include name="mail.jar"/> + </fileset> + </copy> + <copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/> + <delete dir="${tomcat.webapps.dir}/jbossws"/> + </target> + +</project> \ No newline at end of file Property changes on: tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml =================================================================== --- tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-02 11:16:52 UTC (rev 2499) +++ tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-02 11:24:21 UTC (rev 2500) @@ -137,44 +137,49 @@ <!-- ================================================================== --> <!-- Build the bin dist --> - <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc,build-docs" + <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc" description="Build the binary distribution"> - <mkdir dir="${build.bin.dist}"/> - <mkdir dir="${build.bin.dist}/bin"/> - <mkdir dir="${build.bin.dist}/docs/html"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk14"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk15"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/> + <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="${etc.dir}/JBossORG-EULA.txt" overwrite="true"/> <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> - <fileset dir="${core.resources.dir}/dist"/> + <fileset dir="${build.dir}/dist"/> + <fileset dir="${build.dir}/ant-import" includes="build-deploy.xml"/> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> - <copy todir="${build.bin.dist}/bin"> - <fileset dir="${etc.dir}"> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - <include name="wsprovide.bat"/> - <include name="wsprovide.sh"/> - <include name="wsconsume.bat"/> - <include name="wsconsume.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - </fileset> - </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"/> - + + <!-- Install etc --> + <copy todir="${install.etc.dir}"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> + <!-- documentation <copy todir="${build.bin.dist}/docs/html" overwrite="true"> <fileset dir="${docs.userguide.dir}/build/en/html"/> @@ -184,8 +189,8 @@ </copy> --> - <!-- lib/jboss-jdk15 --> - <copy todir="${build.bin.dist}/lib/jboss-jdk15" overwrite="true"> + <!-- 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"/> @@ -198,56 +203,37 @@ <include name="jaxb-*.jar"/> </fileset> </copy> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar"/> - <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50-deployer"/> - <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws50-deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws42.sar"/> - <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws42.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws40.sar"/> - <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws40.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> - - <!-- lib/jboss-jdk14 --> - <copy todir="${build.bin.dist}/lib/jboss-jdk14" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws14-client.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar"/> - <unzip dest="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> - - <!-- lib/tomcat --> - <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> + + <!-- 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="xalan.jar"/> <include name="xercesImpl.jar"/> </fileset> </copy> - <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="activation.jar"/> - <include name="mail.jar"/> - </fileset> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> + + <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}" file="${jboss40.output.lib.dir}/jbossws40.sar"/> + <copy todir="${install.jboss40.dir}" file="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> + <copy todir="${install.jboss40.dir}" file="${jboss40.output.lib.dir}/jbossws14-client.jar"/> + + <!-- 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="${build.bin.dist}/lib/tomcat/webapps" overwrite="true"> + <copy todir="${install.tomcat.dir}" overwrite="true"> <fileset dir="${tomcat.output.lib.dir}" includes="jbossws.war"/> </copy> Copied: tags/jbossws-1.2.0.GA/build/dist (from rev 2496, tags/jbossws-1.2.0.GA/jbossws-core/src/main/resources/dist) Added: tags/jbossws-1.2.0.GA/build/dist/ant.properties.example =================================================================== --- tags/jbossws-1.2.0.GA/build/dist/ant.properties.example (rev 0) +++ tags/jbossws-1.2.0.GA/build/dist/ant.properties.example 2007-03-02 11:24:21 UTC (rev 2500) @@ -0,0 +1,15 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 2481 2007-02-28 11:17:24Z thomas.diesler(a)jboss.com $ + +# Optional JBoss Home +#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1 +#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 + +# The JBoss server instance +jboss.server.instance=default + +# Optional Tomcat Home +#tomcat.home=/usr/java/tomcat Modified: tags/jbossws-1.2.0.GA/integration-jboss40/build.xml =================================================================== --- tags/jbossws-1.2.0.GA/integration-jboss40/build.xml 2007-03-02 11:16:52 UTC (rev 2499) +++ tags/jbossws-1.2.0.GA/integration-jboss40/build.xml 2007-03-02 11:24:21 UTC (rev 2500) @@ -304,114 +304,12 @@ <!-- Deploy jbossws to jboss40 --> <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> - <copy todir="${jboss40.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> - <delete file="${jboss40.home}/client/jbossws14-client.jar"/> - <copy todir="${jboss40.home}/client" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <!-- Only available on jdk1.5 --> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> - <!-- The JBossAS testsuite references jbossws from thirdparty --> - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-client.jar"/> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws-jboss40-integration.jar"/> - </fileset> - </copy> - <!-- Copy jboss-xml-binding.jar --> - <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <!-- Deploy juddi-service.sar --> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss40" inheritall="true"/> </target> <!-- Deploy jbossws to jboss40 jdk1.4 --> <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws"> - <copy todir="${jboss40.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> - <delete file="${jboss40.home}/client/jbossws-client.jar"/> - <copy todir="${jboss40.home}/client" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws14-client.jar"/> - </fileset> - </copy> - <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/> - <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jboss-jaxws14.jar"/> - </fileset> - </copy> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> - <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws14/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws14-client.jar"/> - <include name="jbossws14-core.jar"/> - <include name="jbossws14-jboss40-integration.jar"/> - </fileset> - </copy> - <!-- Copy jboss-xml-binding.jar --> - <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <!-- Deploy juddi-service.sar --> - <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss40-jdk14" inheritall="true"/> </target> <!-- ================================================================== --> Modified: tags/jbossws-1.2.0.GA/integration-jboss42/build.xml =================================================================== --- tags/jbossws-1.2.0.GA/integration-jboss42/build.xml 2007-03-02 11:16:52 UTC (rev 2499) +++ tags/jbossws-1.2.0.GA/integration-jboss42/build.xml 2007-03-02 11:24:21 UTC (rev 2500) @@ -156,54 +156,8 @@ <!-- ================================================================== --> <!-- Deploy jbossws to jboss42 --> - <target name="deploy-jboss42" depends="jboss42-jars" description="Deploy jbossws"> - <copy todir="${jboss42.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> - <!-- The JBossAS testsuite references jbossws from thirdparty --> - <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-client.jar"/> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${jboss42.output.lib.dir}"> - <include name="jbossws-jboss42-integration.jar"/> - </fileset> - </copy> - <!-- Deploy juddi-service.sar --> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/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="${thirdparty.dir}/juddi-service.sar"/> + <target name="deploy-jboss42" depends="jboss42-jars" description="Deploy to jboss42"> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss42" inheritall="true"/> </target> <!-- ================================================================== --> Modified: tags/jbossws-1.2.0.GA/integration-jboss50/build.xml =================================================================== --- tags/jbossws-1.2.0.GA/integration-jboss50/build.xml 2007-03-02 11:16:52 UTC (rev 2499) +++ tags/jbossws-1.2.0.GA/integration-jboss50/build.xml 2007-03-02 11:24:21 UTC (rev 2500) @@ -139,57 +139,8 @@ <!-- ================================================================== --> <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> - <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> - <!-- The JBossAS testsuite references jbossws from thirdparty --> - <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-client.jar"/> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${jboss50.output.lib.dir}"> - <include name="jbossws-jboss50-integration.jar"/> - </fileset> - </copy> - <!-- Deploy juddi-service.sar --> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/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="${thirdparty.dir}/juddi-service.sar"/> + <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy to jboss50"> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss50" inheritall="true"/> </target> <!-- ================================================================== --> Modified: tags/jbossws-1.2.0.GA/integration-tomcat/build.xml =================================================================== --- tags/jbossws-1.2.0.GA/integration-tomcat/build.xml 2007-03-02 11:16:52 UTC (rev 2499) +++ tags/jbossws-1.2.0.GA/integration-tomcat/build.xml 2007-03-02 11:24:21 UTC (rev 2500) @@ -26,7 +26,7 @@ <property name="tomcat.output.lib.dir" value="${tomcat.output.dir}/lib"/> <target name="tomcat-init" depends="prepare, thirdparty"> - <fail message="Not available: ${tomcat.home}/server/lib/catalina.jar" unless="tomcat.available"/> + <fail message="Not available: ${tomcat.available.file}" unless="tomcat.available"/> <available property="jbossws.thirdparty.available" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar"/> </target> @@ -138,43 +138,8 @@ <!-- ================================================================== --> <!-- Deploy to Tomcat --> - <target name="deploy-tomcat" depends="core-jars,tomcat-jars,tomcat-thirdparty-jar" description="Deploy JBossWS to Tomcat"> - <copy todir="${tomcat.common.dir}/endorsed"> - <fileset dir="${thirdparty.dir}"> - <include name="serializer.jar"/> - <include name="xalan.jar"/> - <include name="xercesImpl.jar"/> - </fileset> - </copy> - <copy todir="${tomcat.conf.dir}" overwrite="true"> - <fileset dir="${tomcat.resources.dir}"> - <include name="tomcat-users.xml"/> - </fileset> - </copy> - <copy todir="${tomcat.common.classes}" overwrite="true"> - <fileset dir="${tomcat.resources.dir}"> - <include name="log4j.xml"/> - </fileset> - </copy> - <copy todir="${tomcat.common.lib}" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${tomcat.output.lib.dir}"> - <include name="jbossws-tomcat-integration.jar"/> - <include name="jbossws-thirdparty.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="activation.jar"/> - <include name="log4j.jar"/> - <include name="mail.jar"/> - </fileset> - </copy> - <copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/> - <delete dir="${tomcat.webapps.dir}/jbossws"/> + <target name="deploy-tomcat" depends="core-jars,tomcat-jars,tomcat-thirdparty-jar" description="Deploy Tomcat"> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-tomcat" inheritall="true"/> </target> <target name="clean" depends="prepare" description="Cleans up most generated files.">