Author: heiko.braun(a)jboss.com Date: 2008-03-17 14:06:02 -0400 (Mon, 17 Mar 2008) New Revision: 5986 Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/ant-import/build-metro.xml stack/metro/trunk/ant-import/build-prepare-deploy.xml stack/metro/trunk/ant-import/metro-build-adapter.xml stack/metro/trunk/build.xml stack/metro/trunk/metro-trunk.iml Log: Fix JBWS-1994: Explicit references to metro jars and assertions Modified: stack/metro/trunk/ant-import/build-metro.xml =================================================================== --- stack/metro/trunk/ant-import/build-metro.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/ant-import/build-metro.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -60,7 +60,7 @@ <echo>**********************************</echo> </target> - <target name="-install.adapter" depends="init"> + <target name="install.adapter" depends="init"> <copy todir="${metro.repository.dir}" file="ant-import/metro-build-adapter.xml" overwrite="true" verbose="true"/> </target> Modified: stack/metro/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -37,14 +37,7 @@ <patternset refid="jbossws.lib.endorsed.patternset"/> <patternset refid="jbossws.server.lib.patternset"/> <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - <fileset dir="glassfish-metro/output"> - <patternset refid="jbossws.client.patternset"/> - <patternset refid="jbossws.lib.patternset"/> - <patternset refid="jbossws.lib.endorsed.patternset"/> - <patternset refid="jbossws.server.lib.patternset"/> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> + </fileset> </copy> <copy todir="${deploy.artifacts.dir}/resources"> <fileset dir="${metro.output.resources.dir}"> Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml =================================================================== --- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -5,7 +5,7 @@ <import file="properties.xml"/> <import file="build.xml"/> - <property name="thirdparty.gen" value="../../output"/> + <property name="thirdparty.gen" value="../../../output/lib"/> <property name="thirdparty" value="../../../thirdparty"/> <target name="adapter.init"> @@ -51,10 +51,31 @@ <target name="copy-binaries" description="Builds the metro jars and copies them to glassfish-metro/output" - depends="metro.jars"> + depends="clean, metro.jars"> - <copy todir="${thirdparty.gen}" verbose="true"> + <!-- + assertions + --> + + <available property="jaxws-local-transport.available" filepath="${lib.runtime.dir}" file="jaxws-local-transport.jar"/> + <available property="stax-utils.available" filepath="${lib.runtime.dir}" file="stax-utils.jar"/> + <available property="txnannprocessor.available" filepath="${lib.runtime.dir}" file="txnannprocessor.jar"/> + <available property="wstx-asl-3.2.1.available" filepath="${lib.runtime.dir}" file="wstx-asl-3.2.1.jar"/> + <available property="xmldsig.available" filepath="${lib.runtime.dir}" file="xmldsig.jar"/> + <available property="xws-security.available" filepath="${lib.runtime.dir}" file="xws-security.jar"/> + <available property="resolver.available" filepath="${lib.runtime.dir}" file="resolver.jar"/> + + <fail message="jaxws-local-transport.jar not available" unless="jaxws-local-transport.available"/> + <fail message="stax-utils.jar not available" unless="stax-utils.available"/> + <fail message="txnannprocessor.jar not available" unless="txnannprocessor.available"/> + <fail message="wstx-asl-3.2.1.jar not available" unless="wstx-asl-3.2.1.available"/> + <fail message="xmldsig.jar not available" unless="xmldsig.available"/> + <fail message="xws-security.jar not available" unless="xws-security.available"/> + <fail message="resolver.jar not available" unless="resolver.available"/> + + <copy todir="${thirdparty.gen}" verbose="true" overwrite="true"> + <!-- runtime jars --> <fileset dir="${rt.dir}/build/"> <include name="jboss-wsit-rt.jar"/> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -36,8 +36,8 @@ <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/> <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.metro.dir}/glassfish-metro/output/jboss-wsit-tools.jar"/> - <pathelement location="${int.metro.dir}/glassfish-metro/output/jboss-wsit-rt.jar"/> + <pathelement location="${int.metro.dir}/output/lib/jboss-wsit-tools.jar"/> + <pathelement location="${int.metro.dir}/output/lib/jboss-wsit-rt.jar"/> <pathelement location="${int.metro.dir}/thirdparty/mimepull.jar"/> <!--pathelement location="${int.metro.dir}/thirdparty/jsr173_api.jar"/> @@ -52,7 +52,7 @@ <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/> <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.metro.dir}/glassfish-metro/output/xws-security.jar"/> + <pathelement location="${int.metro.dir}/output/lib/xws-security.jar"/> </path> <path id="tests.extra.classpath"> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/build.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -44,7 +44,7 @@ <property name="deploy.artifacts.dir" value="${metro.output.deploy.dir}-artifacts"/> <property name="deploy.structure.jboss42" value="${metro.output.deploy.dir}-jboss42"/> <property name="deploy.structure.jboss50" value="${metro.output.deploy.dir}-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${metro.dir}/ant-import/jbossws-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${metro.dir}/ant-import/jbossws-default-deploy.conf"/> <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> <import file="${basedir}/ant-import/build-metro.xml"/> Modified: stack/metro/trunk/metro-trunk.iml =================================================================== --- stack/metro/trunk/metro-trunk.iml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/metro-trunk.iml 2008-03-17 18:06:02 UTC (rev 5986) @@ -265,15 +265,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/http.jar!/" /> </CLASSES> <JAVADOC />