Author: thomas.diesler(a)jboss.com Date: 2007-05-09 00:08:27 -0400 (Wed, 09 May 2007) New Revision: 3009 Modified: trunk/build/ant-import/build-deploy.xml trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml Log: Fix deploy-jboss42 Modified: trunk/build/ant-import/build-deploy.xml =================================================================== --- trunk/build/ant-import/build-deploy.xml 2007-05-09 03:39:21 UTC (rev 3008) +++ trunk/build/ant-import/build-deploy.xml 2007-05-09 04:08:27 UTC (rev 3009) @@ -18,7 +18,6 @@ <property name="build.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"/> @@ -27,12 +26,10 @@ <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> @@ -60,12 +57,12 @@ <include name="jboss-saaj.jar"/> </fileset> </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-core.jar"/> </fileset> </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF"> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF" overwrite="true"> <fileset dir="${core.resources.dir}/standard-config"> <include name="standard-*-config.xml"/> </fileset> @@ -85,146 +82,37 @@ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/bin" overwrite="true"> - <fileset dir="${build.etc.dir}"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="${api.output.lib.dir}"> + <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> - <fileset dir="${core.output.lib.dir}"> - <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="${api.output.lib.dir}"> + <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> - <fileset dir="${integration.output.lib.dir}"> - <include name="jbossws-integration.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="${build.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="${api.output.lib.dir}"> - <include name="jboss-jaxrpc.jar" /> - <include name="jboss-jaxws.jar" /> - <include name="jboss-saaj.jar" /> - </fileset> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" overwrite="true"> <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-client.jar" /> + <include name="jbossws-core.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" /> - <include name="stax-api.jar"/> - <include name="wstx.jar"/> - </fileset> </copy> - <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${api.output.lib.dir}"> - <include name="jboss-jaxrpc.jar" /> - <include name="jboss-jaxws.jar" /> - <include name="jboss-saaj.jar" /> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF" overwrite="true"> + <fileset dir="${core.resources.dir}/standard-config"> + <include name="standard-*-config.xml"/> </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" /> + <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> - <!-- 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="${build.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="${api.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="${api.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 --> <!-- ================================================================== --> Modified: trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-05-09 03:39:21 UTC (rev 3008) +++ trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-05-09 04:08:27 UTC (rev 3009) @@ -32,12 +32,6 @@ echo "Cannot find expected build: @hudson.jboss42.build@" exit 1 fi - -# -# build the testsuite -# -cd testsuite -./build.sh clean main </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-05-09 03:39:21 UTC (rev 3008) +++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-05-09 04:08:27 UTC (rev 3009) @@ -32,12 +32,6 @@ echo "Cannot find expected build: @hudson.jboss50.build@" exit 1 fi - -# -# build the testsuite -# -cd testsuite -./build.sh clean main </command> </hudson.tasks.Shell> </builders>