[jbossws-commits] JBossWS SVN: r4129 - in trunk: build/ant-import and 9 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 01:11:33 -0400 (Fri, 03 Aug 2007) New Revision: 4129 Added: trunk/integration/sunri/ant-import/macros-deploy-framework.xml trunk/integration/xfire/ant-import/macros-deploy-framework.xml trunk/jbossws-core/ant-import/macros-deploy-framework.xml Removed: trunk/integration/spi/ Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-setup.xml trunk/build/build.xml trunk/integration/sunri/ant-import/build-bin-dist.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/build.xml trunk/integration/sunri/version.properties trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/build.xml trunk/integration/xfire/version.properties trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/ant-import/build-bin-dist.xml trunk/jbossws-core/ant-import/build-deploy.xml trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/ant-import/macros-deploy-native.xml trunk/jbossws-core/build.xml trunk/jbossws-core/version.properties trunk/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl Log: Externalize jbossws-framework Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/build/ant-import/build-release.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -36,7 +36,6 @@ </target> <target name="release-to-repository" depends="prepare" description="Release to local repository"> - <ant antfile="${framework.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="release" inheritall="false"/> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/build/ant-import/build-setup.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -18,7 +18,6 @@ <!-- ================================================================== --> <property name="build.dir" value="${basedir}/build"/> - <property name="framework.dir" value="${basedir}/integration/spi"/> <property name="core.dir" value="${basedir}/jbossws-core"/> <property name="testsuite.dir" value="${basedir}/testsuite"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/build/build.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -113,7 +113,6 @@ | Build all jar files. --> <target name="jars" depends="prepare" description="Builds all jar files."> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/> </target> @@ -123,7 +122,6 @@ <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${build.dir}/output"/> - <ant antfile="${framework.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/> @@ -132,7 +130,6 @@ <target name="clobber" depends="prepare" description="Cleans up all generated files."> <delete dir="${build.dir}/output"/> - <ant antfile="${framework.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/> Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -52,16 +52,16 @@ <fileset dir="${build.dir}/ant-import"> <include name="build-testsuite.xml"/> </fileset> - <fileset dir="${int.native.dir}/ant-import"> + <fileset dir="${core.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-native.xml"/> </fileset> <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-sunri.xml"/> </fileset> - <fileset dir="${framework.dir}/ant-import"> - <include name="macros-deploy-spi.xml"/> - </fileset> <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-xfire.xml"/> </fileset> <fileset dir="${testsuite.dir}/ant-import"> Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -13,8 +13,8 @@ <project> + <import file="${int.sunri.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> - <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/> <!-- ================================================================== --> <!-- Deployment --> @@ -25,20 +25,18 @@ <ant antfile="${core.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-sunri50 - wsflibs="${framework.dir}/output/lib" stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${int.sunri.dir}/thirdparty" jbosshome="${jboss50.home}"/> </target> <!-- Remove from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> <macro-undeploy-sunri50/> - <macro-undeploy-wsf jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss50.home}"/> </target> <!-- Deploy to jboss42 --> @@ -46,20 +44,18 @@ <ant antfile="${core.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-sunri42 - wsflibs="${framework.dir}/output/lib" stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${int.sunri.dir}/thirdparty" jbosshome="${jboss42.home}"/> </target> <!-- Remove from jboss42 --> <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> <macro-undeploy-sunri42/> - <macro-undeploy-wsf jbosshome="${jboss42.home}"/> + <macro-undeploy-framework jbosshome="${jboss42.home}"/> </target> </project> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -27,8 +27,8 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -42,13 +42,20 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> + + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> @@ -77,19 +84,20 @@ <!-- The compile classpath for jboss50 integration --> <path id="sunri.integration.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-javaee.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + + <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> Added: trunk/integration/sunri/ant-import/macros-deploy-framework.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-framework.xml (rev 0) +++ trunk/integration/sunri/ant-import/macros-deploy-framework.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -0,0 +1,72 @@ +<?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: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ --> + +<project> + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <attribute name="jbosshome"/> + <sequential> + + <!-- BIN SCRIPTS --> + <unzip dest="@{jbosshome}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS--> + <copy todir="@{jbosshome}/client"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS--> + <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-framework"> + <attribute name="jbosshome"/> + <sequential> + <delete> + <!-- BIN SCRIPTS --> + <fileset dir="@{jbosshome}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + </fileset> + + <!-- CLIENT JARS--> + <fileset dir="@{jbosshome}/client"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + + <!-- SERVER JARS--> + <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -18,7 +18,6 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-sunri50"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -112,7 +111,6 @@ </macrodef> <macrodef name="macro-deploy-sunri42"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/build.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -41,7 +41,6 @@ <!-- ================================================================== --> <target name="init" depends="prepare,thirdparty"> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> <mkdir dir="${sunri.output.apidocs.dir}"/> </target> @@ -163,12 +162,10 @@ <include name="jbossws-context.war"/> </fileset> - <fileset dir="${framework.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> <fileset dir="${thirdparty.dir}"> <include name="FastInfoset.jar"/> <include name="http.jar"/> + <include name="jaxrpc-api.jar"/> <include name="jaxws-api.jar"/> <include name="jaxws-rt.jar"/> <include name="jaxws-tools.jar"/> @@ -212,9 +209,6 @@ <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${framework.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-sunri.jar"/> </fileset> @@ -224,6 +218,7 @@ <include name="http.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxrpc-api.jar"/> <include name="jaxws-api.jar"/> <include name="jaxws-rt.jar"/> <include name="jaxws-tools.jar"/> @@ -257,9 +252,6 @@ <classpath> <pathelement path="${sunri50.integration.classpath}"/> <pathelement path="${sunri.integration.classpath}"/> - <fileset dir="${framework.dir}/thirdparty"> - <include name="**/*.jar"/> - </fileset> </classpath> <packageset dir="${sunri.java.dir}" defaultexcludes="yes"> @@ -268,9 +260,6 @@ <packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes"> <include name="com/sun/**"/> </packageset> - <packageset dir="${framework.dir}/src/main/java"> - <include name="org/jboss/wsf/**"/> - </packageset> <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]></doctitle> <tag name="todo" scope="all" description="To do:"/> Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/version.properties 2007-08-03 05:11:33 UTC (rev 4129) @@ -5,10 +5,14 @@ # Thirdparty library versions jbossws-common=2.0.1.CR1 +jbossws-framework=2.0.1.CR1 jbossws-spi=2.0.1.CR1 jbossws-jboss50=2.0.1.CR1 jbossws-jboss42=2.0.1.CR1 +jboss-common-core=2.0.2.GA +jboss-common-logging-spi=2.0.2.GA +jboss-javaee=5.0.0-SNAPSHOT jboss-security-spi=2.0.0.Beta sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/xfire/.classpath =================================================================== --- trunk/integration/xfire/.classpath 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/.classpath 2007-08-03 05:11:33 UTC (rev 4129) @@ -16,7 +16,6 @@ <classpathentry kind="lib" path="thirdparty/spring-core.jar"/> <classpathentry kind="lib" path="thirdparty/spring-web.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -13,8 +13,8 @@ <project> + <import file="${int.xfire.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/> - <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/> <!-- ================================================================== --> <!-- Deployment --> @@ -25,20 +25,18 @@ <ant antfile="${core.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-xfire50 - wsflibs="${framework.dir}/output/lib" stacklibs="${int.xfire.dir}/output/lib" thirdpartylibs="${int.xfire.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${int.xfire.dir}/thirdparty" jbosshome="${jboss50.home}"/> </target> <!-- Remove from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> <macro-undeploy-xfire50/> - <macro-undeploy-wsf jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss50.home}"/> </target> <!-- Deploy to jboss42 --> @@ -46,20 +44,18 @@ <ant antfile="${core.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-xfire42 - wsflibs="${framework.dir}/output/lib" stacklibs="${int.xfire.dir}/output/lib" thirdpartylibs="${int.xfire.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${int.xfire.dir}/thirdparty" jbosshome="${jboss42.home}"/> </target> <!-- Remove from jboss42 --> <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> <macro-undeploy-xfire42/> - <macro-undeploy-wsf jbosshome="${jboss42.home}"/> + <macro-undeploy-framework jbosshome="${jboss42.home}"/> </target> </project> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -27,8 +27,8 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/> Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -42,6 +42,15 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/cxf-incubator.jar" dest="${thirdparty.dir}/cxf-incubator.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/geronimo-javamail.jar" dest="${thirdparty.dir}/geronimo-javamail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/geronimo-ws-metadata.jar" dest="${thirdparty.dir}/geronimo-ws-metadata.jar" usetimestamp="true" verbose="true"/> @@ -57,13 +66,11 @@ <get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> @@ -77,16 +84,17 @@ <target name="thirdparty-classpath" depends="thirdparty-init"> <path id="xfire.integration.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/cxf-incubator.jar"/> + <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/geronimo-ws-metadata.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/saaj-api.jar"/> <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> Added: trunk/integration/xfire/ant-import/macros-deploy-framework.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-framework.xml (rev 0) +++ trunk/integration/xfire/ant-import/macros-deploy-framework.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -0,0 +1,72 @@ +<?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: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ --> + +<project> + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <attribute name="jbosshome"/> + <sequential> + + <!-- BIN SCRIPTS --> + <unzip dest="@{jbosshome}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS--> + <copy todir="@{jbosshome}/client"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS--> + <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-framework"> + <attribute name="jbosshome"/> + <sequential> + <delete> + <!-- BIN SCRIPTS --> + <fileset dir="@{jbosshome}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + </fileset> + + <!-- CLIENT JARS--> + <fileset dir="@{jbosshome}/client"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + + <!-- SERVER JARS--> + <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -19,7 +19,6 @@ <!-- Deploy to jboss50 --> <macrodef name="macro-deploy-xfire50"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -27,9 +26,6 @@ <!-- CLIENT JARS --> <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{wsflibs}"> - <include name="jbossws-framework.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss50.jar"/> <include name="jaxb-api.jar"/> @@ -96,7 +92,6 @@ </macrodef> <macrodef name="macro-deploy-xfire42"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -104,12 +99,8 @@ <!-- CLIENT JARS --> <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{wsflibs}"> - <include name="jbossws-framework.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss42.jar"/> - <include name="jbossws-spi.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/build.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -41,7 +41,6 @@ <!-- ================================================================== --> <target name="init" depends="prepare,thirdparty"> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> <mkdir dir="${xfire.output.apidocs.dir}"/> </target> @@ -149,14 +148,12 @@ <include name="jbossws-context.war"/> </fileset> - <fileset dir="${framework.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> <fileset dir="${thirdparty.dir}"> <include name="cxf-incubator.jar"/> <include name="geronimo-ws-metadata.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxrpc-api.jar"/> <include name="jaxws-api.jar"/> <include name="jdom.jar"/> <include name="neethi.jar"/> @@ -203,9 +200,6 @@ <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${framework.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-xfire.jar"/> </fileset> @@ -215,6 +209,7 @@ <include name="geronimo-ws-metadata.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxrpc-api.jar"/> <include name="jaxws-api.jar"/> <include name="jdom.jar"/> <include name="neethi.jar"/> @@ -250,9 +245,6 @@ <javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} "> <classpath> <pathelement path="${xfire.integration.classpath}"/> - <fileset dir="${framework.dir}/thirdparty"> - <include name="**/*.jar"/> - </fileset> </classpath> <packageset dir="${xfire.java.dir}" defaultexcludes="yes"> <include name="org/jboss/wsf/**"/> @@ -260,10 +252,6 @@ <packageset dir="${xfire.output.dir}/thirdparty-sources" defaultexcludes="yes"> <include name="org/codehaus/**"/> </packageset> - <packageset dir="${framework.dir}/src/main/java"> - <include name="org/jboss/wsf/**"/> - <include name="org/jboss/ws/**"/> - </packageset> <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration XFire</h1>]]></doctitle> <tag name="todo" scope="all" description="To do:"/> <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/--> Modified: trunk/integration/xfire/version.properties =================================================================== --- trunk/integration/xfire/version.properties 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/version.properties 2007-08-03 05:11:33 UTC (rev 4129) @@ -5,6 +5,7 @@ # Thirdparty library versions jbossws-common=2.0.1.CR1 +jbossws-framework=2.0.1.CR1 jbossws-spi=2.0.1.CR1 jbossws-jboss50=2.0.1.CR1 jbossws-jboss42=2.0.1.CR1 @@ -12,6 +13,9 @@ apache-cxf=2.0 apache-xml-commons=1.2 ibm-wsdl4j=1.6.2 +jboss-common-core=2.0.2.GA +jboss-common-logging-spi=2.0.2.GA +jboss-javaee=5.0.0-SNAPSHOT jboss-jaxr=1.2.0.GA jboss-security-spi=2.0.0.Beta Modified: trunk/jbossws-core/ant-import/build-bin-dist.xml =================================================================== --- trunk/jbossws-core/ant-import/build-bin-dist.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/build-bin-dist.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -51,16 +51,16 @@ <fileset dir="${build.dir}/ant-import"> <include name="build-testsuite.xml"/> </fileset> - <fileset dir="${int.native.dir}/ant-import"> + <fileset dir="${core.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-native.xml"/> </fileset> <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-sunri.xml"/> </fileset> - <fileset dir="${framework.dir}/ant-import"> - <include name="macros-deploy-spi.xml"/> - </fileset> <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-xfire.xml"/> </fileset> <fileset dir="${testsuite.dir}/ant-import"> Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -13,8 +13,8 @@ <project> + <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> - <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/> <!-- ================================================================== --> <!-- Deployment JBoss50 --> @@ -25,12 +25,10 @@ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-native50 - wsflibs="${framework.dir}/output/lib" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss50.home}"/> <!-- [JBWS-1617] JAXRPC doc/literal trims empty string @@ -49,7 +47,7 @@ <!-- Remove jbossws from jboss50 --> <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50"> <macro-undeploy-native50/> - <macro-undeploy-wsf jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss50.home}"/> </target> <target name="undeploy-jboss50-endorsed" depends="prepare"> @@ -61,12 +59,10 @@ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-native42 - wsflibs="${framework.dir}/output/lib" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss42.home}"/> <!-- [JBWS-1617] JAXRPC doc/literal trims empty string @@ -86,7 +82,7 @@ <!-- Remove jbossws from jboss42 --> <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42"> <macro-undeploy-native42/> - <macro-undeploy-wsf jbosshome="${jboss42.home}"/> + <macro-undeploy-framework jbosshome="${jboss42.home}"/> </target> <target name="undeploy-jboss42-endorsed" depends="prepare"> <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> @@ -97,12 +93,10 @@ <target name="deploy-jboss40-ejb3"> <macro-deploy-native40 - wsflibs="${framework.dir}/output/lib" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss40.home}"/> </target> @@ -119,6 +113,6 @@ <!-- Remove jbossws from jboss40 --> <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40"> <macro-undeploy-native40/> - <macro-undeploy-wsf jbosshome="${jboss40.home}"/> + <macro-undeploy-framework jbosshome="${jboss40.home}"/> </target> </project> Modified: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -27,8 +27,8 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -42,6 +42,17 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> @@ -67,14 +78,6 @@ <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> @@ -123,7 +126,10 @@ <!-- The compile classpath for jbossws core --> <path id="thirdparty.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/ant.jar"/> @@ -144,8 +150,6 @@ <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/jbosssx.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/policy.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> Added: trunk/jbossws-core/ant-import/macros-deploy-framework.xml =================================================================== --- trunk/jbossws-core/ant-import/macros-deploy-framework.xml (rev 0) +++ trunk/jbossws-core/ant-import/macros-deploy-framework.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -0,0 +1,72 @@ +<?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: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ --> + +<project> + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <attribute name="jbosshome"/> + <sequential> + + <!-- BIN SCRIPTS --> + <unzip dest="@{jbosshome}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS--> + <copy todir="@{jbosshome}/client"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS--> + <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-framework"> + <attribute name="jbosshome"/> + <sequential> + <delete> + <!-- BIN SCRIPTS --> + <fileset dir="@{jbosshome}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + </fileset> + + <!-- CLIENT JARS--> + <fileset dir="@{jbosshome}/client"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + + <!-- SERVER JARS--> + <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Modified: trunk/jbossws-core/ant-import/macros-deploy-native.xml =================================================================== --- trunk/jbossws-core/ant-import/macros-deploy-native.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/macros-deploy-native.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -18,7 +18,6 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-native50"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -123,7 +122,6 @@ </macrodef> <macrodef name="macro-deploy-native42"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -225,7 +223,6 @@ </macrodef> <macrodef name="macro-deploy-native40"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -28,15 +28,14 @@ <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/thirdparty/policy.jar"/> <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> <pathelement location="${core.dir}/thirdparty/wstx.jar"/> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/build.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -33,7 +33,6 @@ <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> <target name="init" depends="prepare,thirdparty-get"> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> </target> <!-- ================================================================== --> Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/version.properties 2007-08-03 05:11:33 UTC (rev 4129) @@ -7,6 +7,7 @@ javassist=3.5.0.CR1 jbpm-bpel=1.1.0.Beta5 jbossws-common=2.0.1.CR1 +jbossws-framework=2.0.1.CR1 jbossws-spi=2.0.1.CR1 jbossws-jboss50=2.0.1.CR1 jbossws-jboss42=2.0.1.CR1 Modified: trunk/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-08-03 05:11:33 UTC (rev 4129) @@ -26,7 +26,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-serviceref'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-serviceref'/> </port> </service> </definitions> \ No newline at end of file