Author: thomas.diesler(a)jboss.com Date: 2007-03-02 08:53:32 -0500 (Fri, 02 Mar 2007) New Revision: 2508 Added: trunk/build/ant-import/build-deploy.xml trunk/build/dist/ trunk/build/dist/Install.txt trunk/build/dist/ReleaseNotes.txt trunk/build/dist/ant.properties.example Removed: trunk/build/dist/Install.txt trunk/build/dist/ReleaseNotes.txt trunk/build/dist/ant.properties.example trunk/jbossws-core/src/main/resources/dist/ trunk/jbossws-docs/ Modified: trunk/build/ant-import/build-hudson.xml trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-setup.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml trunk/integration-jboss40/build.xml trunk/integration-jboss42/build.xml trunk/integration-jboss50/build.xml trunk/integration-tomcat/build.xml Log: svn merge -r2488:2507 https://svn.jboss.org/repos/jbossws/tags/jbossws-1.2.0.GA Add install script. Remove jbossws-docs Copied: trunk/build/ant-import/build-deploy.xml (from rev 2507, tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml) =================================================================== --- trunk/build/ant-import/build-deploy.xml (rev 0) +++ trunk/build/ant-import/build-deploy.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -0,0 +1,280 @@ +<?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"/> + <!-- 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"/> + <!-- 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" /> + <!-- Copy jboss-xml-binding.jar --> + <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" /> + <!-- Copy jboss-xml-binding.jar --> + <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 Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/ant-import/build-hudson.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -63,6 +63,14 @@ <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" description="Setup the Hudson QA environment"> + <!-- get the svn url --> + <exec dir="${build.dir}/.." executable="svn" failonerror="true" output="${build.output.dir}/svn-info.xml"> + <arg line="info"/> + <arg line="--xml"/> + </exec> + <xmlproperty file="${build.output.dir}/svn-info.xml"/> + <property name="svn.url" value="${info.entry.url}"/> + <exec executable="basename" outputproperty="svn.basename"> <arg value="${svn.url}"/> </exec> Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/ant-import/build-release.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -137,44 +137,48 @@ <!-- ================================================================== --> <!-- 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"/> <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,65 +188,51 @@ </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"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> + </copy> + + <!-- Install Thirdparty --> + <copy todir="${install.thirdparty.dir}" overwrite="true"> <fileset dir="${thirdparty.dir}"> + <include name="activation.jar"/> <include name="jbossws-wsconsume-impl.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="jaxb-*.jar"/> + <include name="juddi-service.sar"/> + <include name="mail.jar"/> + <include name="serializer.jar"/> + <include name="xalan.jar"/> + <include name="xercesImpl.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> + + <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50.sar"/> + <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> + <copy todir="${install.jboss42.dir}" file="${jboss42.output.lib.dir}/jbossws42.sar"/> + <copy todir="${install.jboss40.dir}"> <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40.sar"/> + <include name="jbossws40-jdk14.sar"/> <include name="jbossws14-client.jar"/> + <include name="jboss-jaxws14.jar"/> </fileset> </copy> - <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"> - <fileset dir="${thirdparty.dir}"> - <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> + <!-- 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> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/ant-import/build-setup.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -83,14 +83,7 @@ <target name="prepare"> - <!-- get the svn url --> <mkdir dir="${build.output.dir}"/> - <exec dir="${build.dir}/.." executable="svn" failonerror="true" output="${build.output.dir}/svn-info.xml"> - <arg line="info"/> - <arg line="--xml"/> - </exec> - <xmlproperty file="${build.output.dir}/svn-info.xml"/> - <property name="svn.url" value="${info.entry.url}"/> <echo message="jboss50.home = ${jboss50.home}"/> <echo message="jboss42.home = ${jboss42.home}"/> Copied: trunk/build/dist (from rev 2507, tags/jbossws-1.2.0.GA/build/dist) Deleted: trunk/build/dist/Install.txt =================================================================== --- tags/jbossws-1.2.0.GA/build/dist/Install.txt 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/dist/Install.txt 2007-03-02 13:53:32 UTC (rev 2508) @@ -1,35 +0,0 @@ - -(a)implementation.title@ -(a)implementation.url@ - -Version: jbossws-(a)version.id@ - -Installation instructions -========================= - -This distribution ships with JBoss binaries for JDK1.4 and JDK1.5. -Please make sure your chose the right distribution that fits your target JDK. - -In order to install JBossWS the following steps are necessary: - -1.) Copy ant.properties.examples to ant.properties -2.) Modify the target container location in ant.properties -3.) Execute one of the following - - ant deploy-jboss50 - ant deploy-jboss42 - ant deploy-jboss40 - ant deploy-jboss40-jdk14 - ant deploy-tomcat - -Please consult the wiki for detailed up to date install instructions -http://labs.jboss.com/portal/jbossws/ - -After the jbossws.sar is deployed you should be able to access JBossWS under -http://localhost:8080/jbossws - -If you have any questions, please post to the userforum: -http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 - -Enjoy, -The JBossWS Team \ No newline at end of file Copied: trunk/build/dist/Install.txt (from rev 2507, tags/jbossws-1.2.0.GA/build/dist/Install.txt) =================================================================== --- trunk/build/dist/Install.txt (rev 0) +++ trunk/build/dist/Install.txt 2007-03-02 13:53:32 UTC (rev 2508) @@ -0,0 +1,35 @@ + +(a)implementation.title@ +(a)implementation.url@ + +Version: jbossws-(a)version.id@ + +Installation instructions +========================= + +This distribution ships with JBoss binaries for JDK1.4 and JDK1.5. +Please make sure your chose the right distribution that fits your target JDK. + +In order to install JBossWS the following steps are necessary: + +1.) Copy ant.properties.examples to ant.properties +2.) Modify the target container location in ant.properties +3.) Execute one of the following + + ant deploy-jboss50 + ant deploy-jboss42 + ant deploy-jboss40 + ant deploy-jboss40-jdk14 + ant deploy-tomcat + +Please consult the wiki for detailed up to date install instructions +http://labs.jboss.com/portal/jbossws/ + +After the jbossws.sar is deployed you should be able to access JBossWS under +http://localhost:8080/jbossws + +If you have any questions, please post to the userforum: +http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 + +Enjoy, +The JBossWS Team \ No newline at end of file Deleted: trunk/build/dist/ReleaseNotes.txt =================================================================== --- tags/jbossws-1.2.0.GA/build/dist/ReleaseNotes.txt 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/dist/ReleaseNotes.txt 2007-03-02 13:53:32 UTC (rev 2508) @@ -1,173 +0,0 @@ - -(a)implementation.title@ -(a)implementation.url@ - -Version: jbossws-(a)version.id@ - -Release Notes -============= - -The UserGuide accessible from http://labs.jboss.com/portal/jbossws is usally a good starting point -A list of examples that accompany the UserGuide can be found in the samples - -If you have any questions, please post to the JBossWS User Forum -http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 - -For details see the change log. -http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel - -For issues that are scheduled for future versions see the road map. -http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:roadmap-panel - -What's new in jbossws-(a)version.id@ ----------------------------------- - -Feature Request - - * [JBWS-1156] - Implement injection of WebServiceRef - * [JBWS-1021] - Implement javax.xml.ws.Endpoint - * [JBWS-1022] - Implement javax.xml.ws.WebServiceContext - * [JBWS-1023] - Implement javax.xml.ws.Service - * [JBWS-1024] - Implement javax.xml.ws.BindingProvider - * [JBWS-1025] - Implement javax.xml.ws.Dispatch - * [JBWS-1070] - Add context-root in generated jboss-web.xml for Endpoint API - * [JBWS-1207] - Async jaxws dispatch - * [JBWS-1208] - Async jaxws proxy - * [JBWS-1020] - Implement javax.xml.ws.Provider - * [JBWS-1192] - Examples for JSR181 EJB Endpoints: show how to use a JavaBean as an operations's argument or return value - * [JBWS-1388] - Notification validation before dispatch - * [JBWS-1406] - WS-Eventing: event notification failure - * [JBWS-1438] - Implement @WebServiceRef injection for JBossAS-4.2 - * [JBWS-1443] - getMessageContext Not Implemented - * [JBWS-1456] - Allow client configuration on StubExt - * [JBWS-1457] - Support soap attachments on StubExt - -Task - - * [JBWS-1284] - Gracefully handle invalid ImageIO mime types - * [JBWS-1297] - Implement JAXB Fault Marshalling - * [JBWS-1404] - Add support for differing namespaces on SEI and implementation bean - * [JBWS-644] - JAXWS initial implementation - * [JBWS-1031] - Use JAXB-2.0 for JSR-181 endpoints - * [JBWS-1099] - Implement JAXWS Handler Framework - * [JBWS-1150] - Implement JAXWS Logical Handlers - * [JBWS-1315] - Implement WS deployers for jbossas/trunk - * [JBWS-1425] - Update to remoting-2.0 - * [JBWS-723] - Protect access to WSDL - * [JBWS-1077] - Improve/Complete security documentation - * [JBWS-1098] - Publicly available interop endpoints - * [JBWS-1100] - Move WS-Eventing to updated wsa schema - * [JBWS-1155] - Document SwA/XOP usage with JSR181 endpoints. - * [JBWS-1307] - JAXWS user guide and samples - * [JBWS-1418] - Provide JBossWS API docs - * [JBWS-1429] - Cleanup PortComponent annotation - * [JBWS-1433] - Remerge connector discovery code - * [JBWS-1434] - Client programming: Add property API at Service level similiar to StubExt. - * [JBWS-1473] - Setup soak and performance tests - * [JBWS-1503] - Support XOP samples in tomcat - * [JBWS-1504] - Resolve dependency on snapshots - -Bug - - * [JBWS-1079] - Incorrect WSDL to Java mapping for anonymous struct. - * [JBWS-1336] - JAXWSDeployerJSE throws NPE - * [JBWS-1389] - WebServiceProvider should be allowed on EJB3 beans - * [JBWS-1409] - WsdlGenerator crashes on void-methods - * [JBWS-1168] - JAXWS handler ordering - * [JBWS-1357] - JAXWSDeployerJSE is not handling jsp servlet defs correctly - * [JBWS-1374] - Package to namespace mapping is wrong - * [JBWS-1375] - JSR181MetaDataBuilder inspects java.* classes - * [JBWS-800] - ClassCastException when trying to marshal a subclass of Date - * [JBWS-810] - Simple type with restriction - * [JBWS-1184] - WSDL to Java - maps required xsd:double attribute to java.lang.Double - * [JBWS-1231] - wstools/java-wsdl does not handle recursive types - * [JBWS-1259] - WSDL To Java - StackOverflowError with self referencing element. - * [JBWS-1260] - WSDL To Java - Parameter unwrapping fails for a lot of scenarios. - * [JBWS-1285] - NPE when the soap encoded array size is 0 on the return path - * [JBWS-1317] - webservices.xml override does not account for namespaces - * [JBWS-1328] - Security configuration not correctly loaded when deployed as ear to JBoss 5.0.x - * [JBWS-1378] - NPE in replaceAddressLocation with SOAP1.2 WSDL - * [JBWS-1384] - Attachment parts with doclit message - * [JBWS-1386] - ComplexType with base64Binary property - * [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header - * [JBWS-1396] - Now jbossws-beans is exploded jbossws.sar must be exploded - * [JBWS-1408] - NPE when jbossws.sar is not expanded - * [JBWS-1410] - NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT - * [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts - * [JBWS-1428] - Java to WSDL - Arrays defined with indexed properties within value type are skipped when generating the WSDL - * [JBWS-1441] - WSDL to Java - Complex type defined with complexContent only last element is in the generated java class if base type is empty - * [JBWS-1450] - WSDL To Java - Parameter unwrapping not handling nillable types correctly. - * [JBWS-1451] - comparison of the mime type should not be case sensitive - * [JBWS-1455] - WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times if there are multiple operations. - * [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x - * [JBWS-1497] - Fix failed resource lookup when offline - * [JBWS-1501] - wsimport RI fails when processing parameterOrder on one-way operations - - -Errata ------- - FIXME: [JBWS-1294] Add support for mapping async methods - FIXME: [JBWS-1511] MessageFactory does not preserve comments - FIXME: [JBWS-434] Support sequences of anys in JAXRPC - FIXME: [JBWS-751] Multiple schema imports with the same namespace - -Enjoy, -The JBossWS Team - -Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -What's new in jbossws-1.0.4 ---------------------------- - -* [JBWS-660] XOP inline base64Binary and sign message -* [JBWS-779] Add webservices.xml support to wsdlTojava -* [JBWS-868] BPEL in jbossws-samples -* [JBWS-1113] Improve performance of Service.getPort() -* [JBWS-1178] Multiple virtual host and soap:address problem -* [JBWS-1182] Change wsdl-java@file to wsdl-java@location -* [JBWS-1200] Provide source download for GA release -* [JBWS-1261] Provide support for additional MTOM java types besides byte[] -* [JBWS-1299] Add support for wsdl-java@parameter-style -* [JBWS-1302] Use EAR name in context root for EJB endpoints -* [JBWS-1323] Add JBoss EULA -* Bug fixes - -Errata ------- - -* FIXME: [JBWS-1291] Fix JaxrpcMappingValidator -* FIXME: [JBWS-1292] Fix XOPElementRPCTestCase -* FIXME: [JBWS-269] Support attachments in Web Services Tools -* FIXME: [JBWS-269] Support attachments in Web Services Tools -* FIXME: [JBWS-434] Support sequences of anys -* FIXME: [JBWS-798] Complete EventingTestCase -* FIXME: [JBWS-798] Complete EventingTestCase -* FIXME: [JBWS-798] Complete EventingTestCase -* FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums - -What's new in jbossws-1.0.3 ----------------------------------- - -* [JBWS-983] Configure SOAPAction on the Call object -* [JBWS-1090] preventing override of webservices.xml when multiple web services are processed with wstools -* [JBWS-1160] XOP Inline base64 for doc/lit requests -* Bug fixes - -What's new in jbossws-1.0.2 ----------------------------------- - -* [JBWS-855] Provide MTOM for document/literal -* [JBWS-920] integrate wstools wsdl2java functionality -* [JBWS-921] integrate wstools java2wsdl functionality -* [JBWS-932] Performance bottleneck when marshalling array types -* Bug fixes - -What's new in jbossws-1.0.1 ----------------------------------- - -* [JBWS-776] WSDLToJava Support wildcards -* [JBWS-852] Integration with Mikrocontainer -* [JBWS-865] Support security annotations for EJB3 endpoints -* [JBWS-871] Arrays with JSR181 endpoints -* [JBWS-923] Complete MTOM for rpc/literal -* Bug fixes Copied: trunk/build/dist/ReleaseNotes.txt (from rev 2507, tags/jbossws-1.2.0.GA/build/dist/ReleaseNotes.txt) =================================================================== --- trunk/build/dist/ReleaseNotes.txt (rev 0) +++ trunk/build/dist/ReleaseNotes.txt 2007-03-02 13:53:32 UTC (rev 2508) @@ -0,0 +1,173 @@ + +(a)implementation.title@ +(a)implementation.url@ + +Version: jbossws-(a)version.id@ + +Release Notes +============= + +The UserGuide accessible from http://labs.jboss.com/portal/jbossws is usally a good starting point +A list of examples that accompany the UserGuide can be found in the samples + +If you have any questions, please post to the JBossWS User Forum +http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 + +For details see the change log. +http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel + +For issues that are scheduled for future versions see the road map. +http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:roadmap-panel + +What's new in jbossws-(a)version.id@ +---------------------------------- + +Feature Request + + * [JBWS-1156] - Implement injection of WebServiceRef + * [JBWS-1021] - Implement javax.xml.ws.Endpoint + * [JBWS-1022] - Implement javax.xml.ws.WebServiceContext + * [JBWS-1023] - Implement javax.xml.ws.Service + * [JBWS-1024] - Implement javax.xml.ws.BindingProvider + * [JBWS-1025] - Implement javax.xml.ws.Dispatch + * [JBWS-1070] - Add context-root in generated jboss-web.xml for Endpoint API + * [JBWS-1207] - Async jaxws dispatch + * [JBWS-1208] - Async jaxws proxy + * [JBWS-1020] - Implement javax.xml.ws.Provider + * [JBWS-1192] - Examples for JSR181 EJB Endpoints: show how to use a JavaBean as an operations's argument or return value + * [JBWS-1388] - Notification validation before dispatch + * [JBWS-1406] - WS-Eventing: event notification failure + * [JBWS-1438] - Implement @WebServiceRef injection for JBossAS-4.2 + * [JBWS-1443] - getMessageContext Not Implemented + * [JBWS-1456] - Allow client configuration on StubExt + * [JBWS-1457] - Support soap attachments on StubExt + +Task + + * [JBWS-1284] - Gracefully handle invalid ImageIO mime types + * [JBWS-1297] - Implement JAXB Fault Marshalling + * [JBWS-1404] - Add support for differing namespaces on SEI and implementation bean + * [JBWS-644] - JAXWS initial implementation + * [JBWS-1031] - Use JAXB-2.0 for JSR-181 endpoints + * [JBWS-1099] - Implement JAXWS Handler Framework + * [JBWS-1150] - Implement JAXWS Logical Handlers + * [JBWS-1315] - Implement WS deployers for jbossas/trunk + * [JBWS-1425] - Update to remoting-2.0 + * [JBWS-723] - Protect access to WSDL + * [JBWS-1077] - Improve/Complete security documentation + * [JBWS-1098] - Publicly available interop endpoints + * [JBWS-1100] - Move WS-Eventing to updated wsa schema + * [JBWS-1155] - Document SwA/XOP usage with JSR181 endpoints. + * [JBWS-1307] - JAXWS user guide and samples + * [JBWS-1418] - Provide JBossWS API docs + * [JBWS-1429] - Cleanup PortComponent annotation + * [JBWS-1433] - Remerge connector discovery code + * [JBWS-1434] - Client programming: Add property API at Service level similiar to StubExt. + * [JBWS-1473] - Setup soak and performance tests + * [JBWS-1503] - Support XOP samples in tomcat + * [JBWS-1504] - Resolve dependency on snapshots + +Bug + + * [JBWS-1079] - Incorrect WSDL to Java mapping for anonymous struct. + * [JBWS-1336] - JAXWSDeployerJSE throws NPE + * [JBWS-1389] - WebServiceProvider should be allowed on EJB3 beans + * [JBWS-1409] - WsdlGenerator crashes on void-methods + * [JBWS-1168] - JAXWS handler ordering + * [JBWS-1357] - JAXWSDeployerJSE is not handling jsp servlet defs correctly + * [JBWS-1374] - Package to namespace mapping is wrong + * [JBWS-1375] - JSR181MetaDataBuilder inspects java.* classes + * [JBWS-800] - ClassCastException when trying to marshal a subclass of Date + * [JBWS-810] - Simple type with restriction + * [JBWS-1184] - WSDL to Java - maps required xsd:double attribute to java.lang.Double + * [JBWS-1231] - wstools/java-wsdl does not handle recursive types + * [JBWS-1259] - WSDL To Java - StackOverflowError with self referencing element. + * [JBWS-1260] - WSDL To Java - Parameter unwrapping fails for a lot of scenarios. + * [JBWS-1285] - NPE when the soap encoded array size is 0 on the return path + * [JBWS-1317] - webservices.xml override does not account for namespaces + * [JBWS-1328] - Security configuration not correctly loaded when deployed as ear to JBoss 5.0.x + * [JBWS-1378] - NPE in replaceAddressLocation with SOAP1.2 WSDL + * [JBWS-1384] - Attachment parts with doclit message + * [JBWS-1386] - ComplexType with base64Binary property + * [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header + * [JBWS-1396] - Now jbossws-beans is exploded jbossws.sar must be exploded + * [JBWS-1408] - NPE when jbossws.sar is not expanded + * [JBWS-1410] - NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT + * [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts + * [JBWS-1428] - Java to WSDL - Arrays defined with indexed properties within value type are skipped when generating the WSDL + * [JBWS-1441] - WSDL to Java - Complex type defined with complexContent only last element is in the generated java class if base type is empty + * [JBWS-1450] - WSDL To Java - Parameter unwrapping not handling nillable types correctly. + * [JBWS-1451] - comparison of the mime type should not be case sensitive + * [JBWS-1455] - WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times if there are multiple operations. + * [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x + * [JBWS-1497] - Fix failed resource lookup when offline + * [JBWS-1501] - wsimport RI fails when processing parameterOrder on one-way operations + + +Errata +------ + FIXME: [JBWS-1294] Add support for mapping async methods + FIXME: [JBWS-1511] MessageFactory does not preserve comments + FIXME: [JBWS-434] Support sequences of anys in JAXRPC + FIXME: [JBWS-751] Multiple schema imports with the same namespace + +Enjoy, +The JBossWS Team + +Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +What's new in jbossws-1.0.4 +--------------------------- + +* [JBWS-660] XOP inline base64Binary and sign message +* [JBWS-779] Add webservices.xml support to wsdlTojava +* [JBWS-868] BPEL in jbossws-samples +* [JBWS-1113] Improve performance of Service.getPort() +* [JBWS-1178] Multiple virtual host and soap:address problem +* [JBWS-1182] Change wsdl-java@file to wsdl-java@location +* [JBWS-1200] Provide source download for GA release +* [JBWS-1261] Provide support for additional MTOM java types besides byte[] +* [JBWS-1299] Add support for wsdl-java@parameter-style +* [JBWS-1302] Use EAR name in context root for EJB endpoints +* [JBWS-1323] Add JBoss EULA +* Bug fixes + +Errata +------ + +* FIXME: [JBWS-1291] Fix JaxrpcMappingValidator +* FIXME: [JBWS-1292] Fix XOPElementRPCTestCase +* FIXME: [JBWS-269] Support attachments in Web Services Tools +* FIXME: [JBWS-269] Support attachments in Web Services Tools +* FIXME: [JBWS-434] Support sequences of anys +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums + +What's new in jbossws-1.0.3 +---------------------------------- + +* [JBWS-983] Configure SOAPAction on the Call object +* [JBWS-1090] preventing override of webservices.xml when multiple web services are processed with wstools +* [JBWS-1160] XOP Inline base64 for doc/lit requests +* Bug fixes + +What's new in jbossws-1.0.2 +---------------------------------- + +* [JBWS-855] Provide MTOM for document/literal +* [JBWS-920] integrate wstools wsdl2java functionality +* [JBWS-921] integrate wstools java2wsdl functionality +* [JBWS-932] Performance bottleneck when marshalling array types +* Bug fixes + +What's new in jbossws-1.0.1 +---------------------------------- + +* [JBWS-776] WSDLToJava Support wildcards +* [JBWS-852] Integration with Mikrocontainer +* [JBWS-865] Support security annotations for EJB3 endpoints +* [JBWS-871] Arrays with JSR181 endpoints +* [JBWS-923] Complete MTOM for rpc/literal +* Bug fixes Deleted: trunk/build/dist/ant.properties.example =================================================================== --- tags/jbossws-1.2.0.GA/build/dist/ant.properties.example 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/dist/ant.properties.example 2007-03-02 13:53:32 UTC (rev 2508) @@ -1,15 +0,0 @@ -# -# 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 Copied: trunk/build/dist/ant.properties.example (from rev 2507, tags/jbossws-1.2.0.GA/build/dist/ant.properties.example) =================================================================== --- trunk/build/dist/ant.properties.example (rev 0) +++ trunk/build/dist/ant.properties.example 2007-03-02 13:53:32 UTC (rev 2508) @@ -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: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -29,9 +29,11 @@ $SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# build jbossws samples +# build/deploy binary distribution # -ant $ENVIRONMENT clean deploy-jboss40 build-samples +ant $ENVIRONMENT clean build-bin-dist +cd $SVNBASEDIR/build/output/bin-dist +ant $ENVIRONMENT deploy-jboss40 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -29,9 +29,11 @@ $SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# build jbossws samples +# build/deploy binary distribution # -ant $ENVIRONMENT clean deploy-jboss40 build-samples +ant $ENVIRONMENT clean build-bin-dist +cd $SVNBASEDIR/build/output/bin-dist +ant $ENVIRONMENT deploy-jboss40 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -29,9 +29,11 @@ $SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# build jbossws samples +# build/deploy binary distribution # -ant $ENVIRONMENT clean deploy-jboss42 build-samples +ant $ENVIRONMENT clean build-bin-dist +cd $SVNBASEDIR/build/output/bin-dist +ant $ENVIRONMENT deploy-jboss42 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -29,9 +29,11 @@ $SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# build jbossws samples +# build/deploy binary distribution # -ant $ENVIRONMENT clean deploy-jboss50 build-samples +ant $ENVIRONMENT clean build-bin-dist +cd $SVNBASEDIR/build/output/bin-dist +ant $ENVIRONMENT deploy-jboss50 # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -27,9 +27,11 @@ $TOMCAT_INSTANCE/bin/catalina.sh stop # -# build jbossws samples +# build/deploy binary distribution # -ant $ENVIRONMENT clean deploy-tomcat build-samples +ant $ENVIRONMENT clean build-bin-dist +cd $SVNBASEDIR/build/output/bin-dist +ant $ENVIRONMENT deploy-tomcat # # start tomcat Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/integration-jboss40/build.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -304,114 +304,39 @@ <!-- 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"/> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss40" inheritall="true"/> <!-- 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"/> + <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"/> + <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"/> + <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="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"/> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss40-jdk14" inheritall="true"/> <!-- 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"/> + <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 todir="${jboss40.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> </target> <!-- ================================================================== --> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/integration-jboss42/build.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -156,37 +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"/> + <target name="deploy-jboss42" depends="jboss42-jars" description="Deploy to jboss42"> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss42" inheritall="true"/> <!-- The JBossAS testsuite references jbossws from thirdparty --> <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -200,10 +171,6 @@ <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> <!-- ================================================================== --> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/integration-jboss50/build.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -139,39 +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> - </copy> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <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"/> + <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy to jboss50"> + <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss50" inheritall="true"/> <!-- The JBossAS testsuite references jbossws from thirdparty --> <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -185,10 +154,6 @@ <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> <!-- ================================================================== --> Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-03-02 12:50:34 UTC (rev 2507) +++ trunk/integration-tomcat/build.xml 2007-03-02 13:53:32 UTC (rev 2508) @@ -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> @@ -67,7 +67,7 @@ <!-- | Build all jar files. --> - <target name="tomcat-jars" depends="tomcat-compile,tomcat-module-jars" description="Builds all jar files."> + <target name="tomcat-jars" depends="tomcat-compile,tomcat-module-jars,tomcat-thirdparty-jar" description="Builds all jar files."> </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.">