Author: richard.opalka(a)jboss.com Date: 2008-02-15 11:50:36 -0500 (Fri, 15 Feb 2008) New Revision: 5712 Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/ant-import/build-metro.xml stack/metro/trunk/ant-import/metro-build-adapter.xml stack/metro/trunk/build.xml stack/metro/trunk/metro-trunk.iml Log: [JBWS-1994] use glassfish-metro directory Modified: stack/metro/trunk/ant-import/build-metro.xml =================================================================== --- stack/metro/trunk/ant-import/build-metro.xml 2008-02-15 16:32:57 UTC (rev 5711) +++ stack/metro/trunk/ant-import/build-metro.xml 2008-02-15 16:50:36 UTC (rev 5712) @@ -13,7 +13,7 @@ <project basedir="." name="Build-Metro"> - <property name="cvs.dir" value="cvs"/> + <property name="cvs.dir" value="glassfish-metro"/> <property name="metro.repository.dir" value="${cvs.dir}/wsit/wsit"/> <macrodef name="antbridge"> @@ -29,7 +29,7 @@ </macrodef> <target name="-cvs.init"> - <available property="same.checkout" file="checkout_id-${cvs.tag}" type="file"/> + <available property="same.checkout" file="${cvs.dir}/build-marker-${cvs.tag}" type="file"/> </target> <target name="checkout" depends="init, -cvs.init, -cvs.message" unless="same.checkout" @@ -48,7 +48,7 @@ failonerror="true" /> - <touch file="checkout_id-${cvs.tag}"/> + <touch file="${cvs.dir}/build-marker-${cvs.tag}"/> </target> @@ -66,18 +66,17 @@ <target name="clean.metro" description="Cleanup the metro native build"> <antbridge target="clean"/> - <delete dir="thirdparty-gen"/> + <delete dir="glassfish-metro/output"/> </target> <target name="clean.cvs" description="Cleanup the current CVS checkout"> - <delete file="checkout_id*"/> <delete dir="${cvs.dir}"/> </target> <target name="build.metro" depends="checkout, -install.adapter, clean.metro"> <antbridge target="copy-binaries" file="metro-build-adapter.xml"/> <echo>*********************************</echo> - <echo>The metro binaries have been copied to 'thirdparty-gen'</echo> + <echo>The metro binaries have been copied to 'glassfish-metro/output'</echo> <echo>*********************************</echo> </target> Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml =================================================================== --- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-02-15 16:32:57 UTC (rev 5711) +++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-02-15 16:50:36 UTC (rev 5712) @@ -5,7 +5,7 @@ <import file="properties.xml"/> <import file="build.xml"/> - <property name="thirdparty.gen" value="../../../thirdparty-gen"/> + <property name="thirdparty.gen" value="../../output"/> <property name="thirdparty" value="../../../thirdparty"/> <target name="adapter.init"> @@ -50,7 +50,7 @@ </target> <target name="copy-binaries" - description="Builds the metro jars and copies them to thirdparty-gen" + description="Builds the metro jars and copies them to glassfish-metro/output" depends="metro.jars"> <copy todir="${thirdparty.gen}" verbose="true"> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-15 16:32:57 UTC (rev 5711) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-15 16:50:36 UTC (rev 5712) @@ -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}/thirdparty-gen/jboss-wsit-tools.jar"/> - <pathelement location="${int.metro.dir}/thirdparty-gen/jboss-wsit-rt.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}/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}/thirdparty-gen/xws-security.jar"/> + <pathelement location="${int.metro.dir}/glassfish-metro/output/xws-security.jar"/> </path> <path id="tests.extra.classpath"> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-02-15 16:32:57 UTC (rev 5711) +++ stack/metro/trunk/build.xml 2008-02-15 16:50:36 UTC (rev 5712) @@ -187,7 +187,7 @@ </fileset> <!-- Any extra metro jar, including metro-rt.jar --> - <fileset dir="thirdparty-gen"> + <fileset dir="glassfish-metro/output"> <include name="*.jar"/> </fileset> @@ -248,7 +248,7 @@ </fileset> <!-- Any extra metro jar, including metro-rt.jar --> - <fileset dir="thirdparty-gen"> + <fileset dir="glassfish-metro/output"> <include name="*.jar"/> </fileset> Modified: stack/metro/trunk/metro-trunk.iml =================================================================== --- stack/metro/trunk/metro-trunk.iml 2008-02-15 16:32:57 UTC (rev 5711) +++ stack/metro/trunk/metro-trunk.iml 2008-02-15 16:50:36 UTC (rev 5712) @@ -292,7 +292,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/wstx-asl-3.2.1.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/wstx-asl-3.2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -301,7 +301,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/stax-utils.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/stax-utils.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -310,7 +310,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/xws-security.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/xws-security.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -319,7 +319,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/jboss-wsit-tools.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/jboss-wsit-tools.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -328,7 +328,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/resolver.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/resolver.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -337,7 +337,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/jboss-wsit-rt.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/jboss-wsit-rt.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -346,7 +346,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/jaxws-local-transport.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/jaxws-local-transport.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -355,7 +355,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/xmldsig.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/xmldsig.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -364,7 +364,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty-gen/txnannprocessor.jar!/" /> + <root url="jar://$MODULE_DIR$/glassfish-metro/output/txnannprocessor.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />