Author: thomas.diesler(a)jboss.com Date: 2007-08-02 07:14:11 -0400 (Thu, 02 Aug 2007) New Revision: 4092 Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/common/ trunk/integration/spi/src/main/java/org/jboss/wsf/test/ Modified: trunk/build/version.properties trunk/integration/jboss40/ant-import/build-thirdparty.xml trunk/integration/jboss42/ant-import/build-thirdparty.xml trunk/integration/jboss50/ant-import/build-thirdparty.xml trunk/integration/native/ant-import/build-testsuite.xml trunk/integration/native/ant-import/build-thirdparty.xml trunk/integration/spi/ant-import/build-thirdparty.xml trunk/integration/spi/ant-import/macros-deploy-wsf.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/jbossws-core/ant-import/build-thirdparty.xml Log: Externalize jbossws-common.jar Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/build/version.properties 2007-08-02 11:14:11 UTC (rev 4092) @@ -24,6 +24,7 @@ jboss-jaxr=1.2.0.GA jboss-jbossxb=1.0.0.GA-brew jboss-microcontainer=2.0.0.Beta3 +jbossws-common=2.0.1.CR1 jbossws-spi=2.0.1.CR1 junit=3.8.1 stax-api=1.0 Modified: trunk/integration/jboss40/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -34,6 +34,7 @@ <path id="jbws40.integration.classpath"> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <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="${framework.dir}/thirdparty/jaxws-api.jar"/> <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/> Modified: trunk/integration/jboss42/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -33,6 +33,7 @@ <!-- The compile classpath for jboss42 integration --> <path id="jbws42.integration.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="${framework.dir}/thirdparty/jaxws-api.jar"/> <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/> Modified: trunk/integration/jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -33,6 +33,7 @@ <!-- The compile classpath for jboss50 integration --> <path id="jbws50.integration.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="${framework.dir}/thirdparty/jaxws-api.jar"/> <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/> Modified: trunk/integration/native/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -28,6 +28,8 @@ <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-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"/> Modified: trunk/integration/native/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -36,6 +36,7 @@ <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/jbossws-common.jar"/> <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${framework.dir}/thirdparty/servlet-api.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> Modified: trunk/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -48,6 +48,7 @@ <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}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" 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}/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/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"/> @@ -88,6 +89,7 @@ <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> Modified: trunk/integration/spi/ant-import/macros-deploy-wsf.xml =================================================================== --- trunk/integration/spi/ant-import/macros-deploy-wsf.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/spi/ant-import/macros-deploy-wsf.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -29,6 +29,7 @@ <include name="jbossws-framework.jar"/> </fileset> <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> <include name="jbossws-spi.jar"/> <include name="wsdl4j.jar"/> </fileset> @@ -40,6 +41,7 @@ <include name="jbossws-framework.jar"/> </fileset> <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> <include name="jbossws-spi.jar"/> </fileset> </copy> @@ -58,6 +60,7 @@ <!-- CLIENT JARS--> <fileset dir="@{jbosshome}/client"> + <include name="jbossws-common.jar"/> <include name="jbossws-framework.jar"/> <include name="jbossws-spi.jar"/> <include name="wsdl4j.jar"/> @@ -65,6 +68,7 @@ <!-- 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> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -28,6 +28,7 @@ <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-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-02 11:05:57 UTC (rev 4091) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -43,6 +43,7 @@ <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-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.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"/> @@ -83,6 +84,7 @@ <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}/jsr181-api.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -28,6 +28,7 @@ <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-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-02 11:05:57 UTC (rev 4091) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -58,6 +58,7 @@ <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/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}/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"/> @@ -80,6 +81,7 @@ <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}/saaj-api.jar"/> <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 11:14:11 UTC (rev 4092) @@ -67,6 +67,8 @@ <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/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"/> @@ -82,7 +84,6 @@ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.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}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> @@ -137,6 +138,7 @@ <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"/>