Author: thomas.diesler(a)jboss.com Date: 2007-01-27 14:20:15 -0500 (Sat, 27 Jan 2007) New Revision: 2167 Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss42/build.xml Log: deploy jbossxb to AS thirdparty Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-27 13:04:37 UTC (rev 2166) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-27 19:20:15 UTC (rev 2167) @@ -295,8 +295,6 @@ <!-- Deploy jbossws to jboss40 --> <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> - <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"/> <delete file="${jboss40.home}/client/jbossws14-client.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -321,7 +319,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"/> - <!-- deploy the BPEL sar --> + <!-- Deploy the BPEL sar --> <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss40.home}/server/${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> @@ -332,12 +330,14 @@ <include name="jboss-saaj.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"/> </target> <!-- Deploy jbossws to jboss40 jdk1.4 --> <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws"> - <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"/> <delete file="${jboss40.home}/client/jbossws-client.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -362,7 +362,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"/> - <!-- deploy the BPEL sar --> + <!-- Deploy the BPEL sar --> <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss40.home}/server/${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> @@ -374,6 +374,10 @@ <include name="jboss-saaj.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"/> </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-01-27 13:04:37 UTC (rev 2166) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-01-27 19:20:15 UTC (rev 2167) @@ -135,8 +135,6 @@ <!-- Deploy jbossws to jboss42 --> <target name="deploy-jboss42" depends="jboss42-jars" description="Deploy jbossws"> - <copy todir="${jboss42.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss42.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -155,7 +153,7 @@ <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 the BPEL sar --> + <!-- Deploy the BPEL sar --> <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss42.home}/server/${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> @@ -166,6 +164,10 @@ <include name="jboss-saaj.jar"/> </fileset> </copy> + <!-- Copy jboss-xml-binding.jar --> + <copy todir="${jboss42.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss42.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss42.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> </target> <!-- ================================================================== -->