Author: thomas.diesler(a)jboss.com Date: 2007-03-02 07:06:11 -0500 (Fri, 02 Mar 2007) New Revision: 2503 Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.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 Log: Remove deploy to jbossas thirdparty Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml =================================================================== --- tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml 2007-03-02 12:00:17 UTC (rev 2502) +++ tags/jbossws-1.2.0.GA/build/ant-import/build-deploy.xml 2007-03-02 12:06:11 UTC (rev 2503) @@ -78,19 +78,6 @@ <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"/> @@ -136,19 +123,6 @@ <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"/> @@ -197,21 +171,7 @@ <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 --> @@ -255,20 +215,7 @@ <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 --> Modified: tags/jbossws-1.2.0.GA/integration-jboss40/build.xml =================================================================== --- tags/jbossws-1.2.0.GA/integration-jboss40/build.xml 2007-03-02 12:00:17 UTC (rev 2502) +++ tags/jbossws-1.2.0.GA/integration-jboss40/build.xml 2007-03-02 12:06:11 UTC (rev 2503) @@ -305,11 +305,38 @@ <!-- Deploy jbossws to jboss40 --> <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> <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" /> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws-jboss40-integration.jar" /> + </fileset> + </copy> + <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"> <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 todir="${jboss40.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="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 12:00:17 UTC (rev 2502) +++ tags/jbossws-1.2.0.GA/integration-jboss42/build.xml 2007-03-02 12:06:11 UTC (rev 2503) @@ -158,6 +158,19 @@ <!-- Deploy jbossws to jboss42 --> <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}"> + <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> </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 12:00:17 UTC (rev 2502) +++ tags/jbossws-1.2.0.GA/integration-jboss50/build.xml 2007-03-02 12:06:11 UTC (rev 2503) @@ -141,6 +141,19 @@ <!-- Deploy jbossws to jboss50 --> <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}"> + <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> </target> <!-- ================================================================== -->