Author: thomas.diesler(a)jboss.com Date: 2008-04-28 16:23:02 -0400 (Mon, 28 Apr 2008) New Revision: 6729 Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/ant-import/build-bin-dist.xml stack/metro/trunk/ant-import/build-deploy.xml stack/metro/trunk/ant-import/build-prepare-deploy.xml stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/ant-import/jbossws-deploy-macros.xml stack/metro/trunk/build.xml Log: update metro build to use jbossws-jboss??? integration jars Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-04-28 16:34:40 UTC (rev 6728) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-04-28 20:23:02 UTC (rev 6729) @@ -19,7 +19,7 @@ <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution"> - <property name="bindist.dir" value="${metro.output.dir}/jbossws-metro-dist"/> + <property name="bindist.dir" value="${stack.output.dir}/jbossws-metro-dist"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.deploy.dir" value="${bindist.dir}/deploy"/> <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> @@ -34,17 +34,17 @@ <mkdir dir="${bindist.tools.dir}"/> <!-- root --> - <copy tofile="${bindist.dir}/ant.properties.example" file="${metro.distro.dir}/ant.properties.example"> + <copy tofile="${bindist.dir}/ant.properties.example" file="${stack.distro.dir}/ant.properties.example"> <filterset> - <filtersfile file="${metro.dir}/ant.properties"/> + <filtersfile file="${stack.dir}/ant.properties"/> </filterset> </copy> - <copy tofile="${bindist.dir}/version.properties" file="${metro.dir}/version.properties"/> - <copy tofile="${bindist.dir}/build.xml" file="${metro.distro.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.dir}/version.properties" file="${stack.dir}/version.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${stack.distro.dir}/bin-dist-build.xml"/> <!-- build --> <copy todir="${bindist.build.dir}"> - <fileset dir="${metro.dir}/ant-import"> + <fileset dir="${stack.dir}/ant-import"> <include name="build-deploy.xml"/> <include name="jbossws-deploy-macros.xml"/> <include name="jbossws-default-deploy.conf"/> @@ -58,29 +58,29 @@ <!-- docs --> <copy todir="${bindist.docs.dir}"> - <fileset dir="${metro.output.dir}"> + <fileset dir="${stack.output.dir}"> <include name="apidocs/**"/> </fileset> </copy> <copy todir="${bindist.docs.dir}" filtering="yes"> - <fileset dir="${metro.distro.dir}"> + <fileset dir="${stack.distro.dir}"> <include name="Install.txt"/> <include name="ReleaseNotes.txt"/> </fileset> <filterset> - <filtersfile file="${metro.dir}/version.properties"/> + <filtersfile file="${stack.dir}/version.properties"/> </filterset> </copy> <copy todir="${bindist.docs.dir}"> - <fileset dir="${metro.etc.dir}"> + <fileset dir="${stack.etc.dir}"> <include name="JBossORG-EULA.txt"/> </fileset> </copy> <!-- tests --> <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${metro.dir}/src/test-framework"> + <fileset dir="${stack.dir}/src/test-framework"> <include name="ant-import/build-testsuite.xml"/> <include name="ant-import/build-samples-jaxws.xml"/> <include name="etc/**"/> @@ -89,7 +89,7 @@ <include name="resources/jaxws/samples/**"/> <include name="resources/jaxws/smoke/**"/> </fileset> - <fileset dir="${metro.dir}/src/test"> + <fileset dir="${stack.dir}/src/test"> <include name="resources/test-excludes-*.txt"/> <include name="etc/log4j.xml"/> </fileset> @@ -97,18 +97,18 @@ <!-- build tools --> <copy todir="${bindist.tools.dir}" overwrite="true"> - <fileset dir="${metro.dir}/tools"/> + <fileset dir="${stack.dir}/tools"/> </copy> <copy todir="${bindist.dir}" overwrite="true"> - <fileset dir="${metro.dir}"> + <fileset dir="${stack.dir}"> <include name="build.bat"/> <include name="build.sh"/> </fileset> </copy> <chmod file="${bindist.dir}/build.sh" perm="+x"/> - <zip destfile="${metro.output.dir}/jbossws-${version.id}.zip"> - <fileset dir="${metro.output.dir}" includes="jbossws-metro-dist/**"/> + <zip destfile="${stack.output.dir}/jbossws-${version.id}.zip"> + <fileset dir="${stack.output.dir}" includes="jbossws-metro-dist/**"/> </zip> </target> Modified: stack/metro/trunk/ant-import/build-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-deploy.xml 2008-04-28 16:34:40 UTC (rev 6728) +++ stack/metro/trunk/ant-import/build-deploy.xml 2008-04-28 20:23:02 UTC (rev 6729) @@ -21,8 +21,9 @@ <delete dir="${deploy.structure.jboss42}"/> <antcall target="deploy-jbossws-metro42" inheritall="false"> <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> - <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/> + <param name="resourcesdir" value="${deploy.artifacts.dir}/resources"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${deploy.target}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> </target> @@ -31,6 +32,10 @@ <!-- Deployment JBoss422 --> <!-- ================================================================== --> + <target name="deploy-target-jboss422" depends="prepare"> + <property name="deploy.target" value="jboss422"/> + </target> + <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> <copy todir="${jboss422.home}" overwrite="true"> @@ -40,7 +45,7 @@ <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> + <target name="undeploy-jboss422" depends="deploy-target-jboss422" description="Remove jbossws from jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> <delete dir="${jboss422.server.deploy}/juddi-service.sar"/> @@ -50,6 +55,10 @@ <!-- Deployment JBoss423 --> <!-- ================================================================== --> + <target name="deploy-target-jboss423" depends="prepare"> + <property name="deploy.target" value="jboss423"/> + </target> + <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> <copy todir="${jboss423.home}" overwrite="true"> @@ -59,7 +68,7 @@ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> + <target name="undeploy-jboss423" depends="deploy-target-jboss423" description="Remove jbossws from jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> <delete dir="${jboss423.server.deploy}/juddi-service.sar"/> @@ -74,6 +83,7 @@ <antcall target="deploy-jbossws-metro50" inheritall="false"> <param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${deploy.target}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/> </target> @@ -82,6 +92,10 @@ <!-- Deployment JBoss500 --> <!-- ================================================================== --> + <target name="deploy-target-jboss500" depends="prepare"> + <property name="deploy.target" value="jboss500"/> + </target> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <copy todir="${jboss500.home}" overwrite="true"> @@ -91,7 +105,7 @@ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> + <target name="undeploy-jboss500" depends="deploy-target-jboss500" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> <delete dir="${jboss500.server.deploy}/juddi-service.sar"/> @@ -101,6 +115,10 @@ <!-- Deployment JBoss501 --> <!-- ================================================================== --> + <target name="deploy-target-jboss501" depends="prepare"> + <property name="deploy.target" value="jboss501"/> + </target> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true"> @@ -110,7 +128,7 @@ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <target name="undeploy-jboss501" depends="deploy-target-jboss501" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> <delete dir="${jboss501.server.deploy}/juddi-service.sar"/> Modified: stack/metro/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-04-28 16:34:40 UTC (rev 6728) +++ stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-04-28 20:23:02 UTC (rev 6729) @@ -30,11 +30,15 @@ <patternset refid="jbossws.server.lib.patternset"/> <patternset refid="jbossws.service.lib.patternset"/> <include name="juddi-service.sar"/> - <include name="jbossws-jboss50-container.jar"/> - <include name="jbossws-jboss42.jar"/> - <include name="jbossws-jboss50.jar"/> + <include name="jbossws-jboss421.jar"/> + <include name="jbossws-jboss422.jar"/> + <include name="jbossws-jboss423.jar"/> + <include name="jbossws-jboss500.jar"/> + <include name="jbossws-jboss501.jar"/> + <include name="jbossws-jboss500-container.jar"/> + <include name="jbossws-jboss501-container.jar"/> </fileset> - <fileset dir="${metro.output.lib.dir}"> + <fileset dir="${stack.output.lib.dir}"> <patternset refid="jbossws.client.patternset"/> <patternset refid="jbossws.lib.patternset"/> <patternset refid="jbossws.lib.endorsed.patternset"/> @@ -44,12 +48,10 @@ </fileset> </copy> <copy todir="${deploy.artifacts.dir}/resources"> - <fileset dir="${metro.output.resources.dir}"> - <include name="jbossws-metro42-beans.xml"/> - <include name="jbossws-metro50-beans.xml"/> - <include name="jbossws-jboss42.sar/**"/> + <fileset dir="${stack.output.resources.dir}"> + <include name="jbossws-jboss*/**"/> + <include name="jbossws-deployer-beans.xml"/> <include name="jbossws-metro.sar/**"/> - <include name="jbossws-deployer-beans.xml"/> </fileset> </copy> </target> Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-28 16:34:40 UTC (rev 6728) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-28 20:23:02 UTC (rev 6729) @@ -13,7 +13,7 @@ <project> - <property file="${int.metro.dir}/version.properties"/> + <property file="${stack.dir}/version.properties"/> <!-- ========= --> <!-- Libraries --> @@ -24,15 +24,15 @@ <target name="thirdparty-init" depends="prepare"> - <property name="glassfish.metro.dir" value="${int.metro.dir}/glassfish-metro"/> - <available property="glassfish.metro.available" file="${glassfish.metro.dir}"/> - <available property="jboss.wsit.rt.available" file="${metro.output.lib.dir}/jboss-wsit-rt.jar"/> - <available property="jboss.wsit.tools.available" file="${metro.output.lib.dir}/jboss-wsit-tools.jar"/> + <property name="glassfish.stack.dir" value="${stack.dir}/glassfish-metro"/> + <available property="glassfish.stack.available" file="${glassfish.stack.dir}"/> + <available property="jboss.wsit.rt.available" file="${stack.output.lib.dir}/jboss-wsit-rt.jar"/> + <available property="jboss.wsit.tools.available" file="${stack.output.lib.dir}/jboss-wsit-tools.jar"/> - <checksum file="${int.metro.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${stack.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <property name="checksum.ok.${checksum.ok}" value="true"/> - <property name="thirdparty.dir" value="${int.metro.dir}/thirdparty"/> + <property name="thirdparty.dir" value="${stack.dir}/thirdparty"/> <condition property="force.thirdparty.get"> <or> <not> @@ -104,13 +104,13 @@ <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.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}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <checksum file="${int.metro.dir}/version.properties" fileext=".md5"/> + <checksum file="${stack.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-get,metro-build"> <!-- The compile classpath for jboss50 integration --> - <path id="metro.integration.classpath"> + <path id="stack.integration.classpath"> <!-- A stack MUST NOT have a compile time dependency on framework http://www.jboss.org/index.html?module=bb&op=viewtopic&t=133071 @@ -134,7 +134,7 @@ <!-- The compile classpath for jboss50 integration --> <path id="metro50.integration.classpath"> - <path refid="metro.integration.classpath"/> + <path refid="stack.integration.classpath"/> <pathelement location="${jboss500.server.lib}/jboss.jar"/> </path> @@ -144,75 +144,75 @@ <target name="metro-build" depends="metro-copy-jars" description="Build metro from source"> </target> - <target name="metro-checkout-dir" depends="thirdparty-init" unless="glassfish.metro.available"> - <property name="metro.checkout.required" value="true"/> - <echo message="metro.checkout.required=${metro.checkout.required}"/> + <target name="metro-checkout-dir" depends="thirdparty-init" unless="glassfish.stack.available"> + <property name="stack.checkout.required" value="true"/> + <echo message="stack.checkout.required=${stack.checkout.required}"/> </target> - <target name="metro-checkout-required" depends="metro-checkout-dir" if="glassfish.metro.available"> - <available property="metro.checkout.available" file="${glassfish.metro.dir}/wsit/wsit/build.xml" type="file"/> - <echo message="metro.checkout.available=${metro.checkout.available}"/> + <target name="metro-checkout-required" depends="metro-checkout-dir" if="glassfish.stack.available"> + <available property="stack.checkout.available" file="${glassfish.stack.dir}/wsit/wsit/build.xml" type="file"/> + <echo message="stack.checkout.available=${stack.checkout.available}"/> </target> - <target name="metro-checkout" depends="metro-checkout-required" unless="metro.checkout.available"> - <echo message="cvs checkout -r${metro.cvs.tag}"/> - <delete dir="${glassfish.metro.dir}"/> - <cvs cvsRoot=":pserver:${cvs.user}@cvs.dev.java.net:/cvs" package="wsit/wsit" dest="${glassfish.metro.dir}" tag="${metro.cvs.tag}" failonerror="true"/> + <target name="metro-checkout" depends="metro-checkout-required" unless="stack.checkout.available"> + <echo message="cvs checkout -r${stack.cvs.tag}"/> + <delete dir="${glassfish.stack.dir}"/> + <cvs cvsRoot=":pserver:${cvs.user}@cvs.dev.java.net:/cvs" package="wsit/wsit" dest="${glassfish.stack.dir}" tag="${stack.cvs.tag}" failonerror="true"/> </target> - <target name="metro-build-required" depends="metro-checkout-dir" if="glassfish.metro.available"> - <available property="metro.build.is.available" file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}" type="file"/> + <target name="metro-build-required" depends="metro-checkout-dir" if="glassfish.stack.available"> + <available property="stack.build.is.available" file="${glassfish.stack.dir}/build-marker-${stack.cvs.tag}" type="file"/> - <condition property="metro.build.available" value="true"> + <condition property="stack.build.available" value="true"> <and> - <equals arg1="${metro.build.is.available}" arg2="true"/> + <equals arg1="${stack.build.is.available}" arg2="true"/> <not> <equals arg1="${force.thirdparty.get}" arg2="true"/> </not> </and> </condition> - <echo message="*** metro.build.available=${metro.build.available} ***"/> + <echo message="*** stack.build.available=${stack.build.available} ***"/> </target> - <target name="metro-cvs-build" depends="metro-checkout,metro-build-required" unless="metro.build.available"> - <antbridge basedir="${glassfish.metro.dir}/wsit/wsit" target="main"/> + <target name="metro-cvs-build" depends="metro-checkout,metro-build-required" unless="stack.build.available"> + <antbridge basedir="${glassfish.stack.dir}/wsit/wsit" target="main"/> </target> <target name="metro-runtime-jar" depends="metro-cvs-build" unless="jboss.wsit.rt.available"> - <antbridge basedir="${glassfish.metro.dir}/wsit/wsit" target="create-wsit-runtime-jar"/> - <delete dir="${metro.output.lib.dir}/jboss-wsit-rt"/> - <unzip src="${glassfish.metro.dir}/wsit/wsit/rt/build/wsit-rt.jar" dest="${metro.output.lib.dir}/jboss-wsit-rt"/> - <move file="${metro.output.lib.dir}/jboss-wsit-rt/WEB-INF" todir="${metro.output.lib.dir}/jboss-wsit-rt/wsdl"/> - <zip basedir="${metro.output.lib.dir}/jboss-wsit-rt" destfile="${metro.output.lib.dir}/jboss-wsit-rt.jar"/> + <antbridge basedir="${glassfish.stack.dir}/wsit/wsit" target="create-wsit-runtime-jar"/> + <delete dir="${stack.output.lib.dir}/jboss-wsit-rt"/> + <unzip src="${glassfish.stack.dir}/wsit/wsit/rt/build/wsit-rt.jar" dest="${stack.output.lib.dir}/jboss-wsit-rt"/> + <move file="${stack.output.lib.dir}/jboss-wsit-rt/WEB-INF" todir="${stack.output.lib.dir}/jboss-wsit-rt/wsdl"/> + <zip basedir="${stack.output.lib.dir}/jboss-wsit-rt" destfile="${stack.output.lib.dir}/jboss-wsit-rt.jar"/> </target> <target name="metro-tools-jar" depends="metro-cvs-build" unless="jboss.wsit.tools.available"> - <antbridge basedir="${glassfish.metro.dir}/wsit/wsit" target="create-wsit-tools-jar"/> - <delete dir="${metro.output.lib.dir}/jboss-wsit-tools"/> - <unzip src="${glassfish.metro.dir}/wsit/wsit/tools/build/wsit-tools.jar" dest="${metro.output.lib.dir}/jboss-wsit-tools"/> - <copy todir="${metro.output.lib.dir}/jboss-wsit-tools/META-INF/services" overwrite="true" verbose="true"> - <fileset dir="${glassfish.metro.dir}/wsit/wsit/etc/META-INF/services"> + <antbridge basedir="${glassfish.stack.dir}/wsit/wsit" target="create-wsit-tools-jar"/> + <delete dir="${stack.output.lib.dir}/jboss-wsit-tools"/> + <unzip src="${glassfish.stack.dir}/wsit/wsit/tools/build/wsit-tools.jar" dest="${stack.output.lib.dir}/jboss-wsit-tools"/> + <copy todir="${stack.output.lib.dir}/jboss-wsit-tools/META-INF/services" overwrite="true" verbose="true"> + <fileset dir="${glassfish.stack.dir}/wsit/wsit/etc/META-INF/services"> <include name="*.TWSDLExtensionHandler"/> </fileset> </copy> - <zip basedir="${metro.output.lib.dir}/jboss-wsit-tools" destfile="${metro.output.lib.dir}/jboss-wsit-tools.jar"/> + <zip basedir="${stack.output.lib.dir}/jboss-wsit-tools" destfile="${stack.output.lib.dir}/jboss-wsit-tools.jar"/> </target> <!-- Copy the metro jars --> <target name="metro-copy-jars" depends="thirdparty-get,metro-cvs-build,metro-runtime-jar,metro-tools-jar" - unless="metro.build.available"> + unless="stack.build.available"> <mkdir dir="${thirdparty.dir}"/> - <property name="lib.runtime.dir" value="${glassfish.metro.dir}/wsit/wsit/lib/runtime"/> + <property name="lib.runtime.dir" value="${glassfish.stack.dir}/wsit/wsit/lib/runtime"/> <!-- Verify the JAX-WS Implementation version --> - <unjar src="${lib.runtime.dir}/jaxws-rt.jar" dest="${metro.output.lib.dir}/jaxws-rt" overwrite="true"> + <unjar src="${lib.runtime.dir}/jaxws-rt.jar" dest="${stack.output.lib.dir}/jaxws-rt" overwrite="true"> <patternset> <include name="META-INF/MANIFEST.MF"/> </patternset> </unjar> - <loadfile property="jaxws.impl.version" srcfile="${metro.output.lib.dir}/jaxws-rt/META-INF/MANIFEST.MF"> + <loadfile property="jaxws.impl.version" srcfile="${stack.output.lib.dir}/jaxws-rt/META-INF/MANIFEST.MF"> <filterchain> <linecontains> <contains value="Implementation-Version"/> @@ -271,7 +271,7 @@ <copy file="${lib.runtime.dir}/resolver.jar" tofile="${thirdparty.dir}/wsit-resolver.jar" verbose="true" overwrite="false"/> <!-- Touch the build marker --> - <touch file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}"/> + <touch file="${glassfish.stack.dir}/build-marker-${stack.cvs.tag}"/> </target> <macrodef name="antbridge"> Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-28 16:34:40 UTC (rev 6728) +++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-28 20:23:02 UTC (rev 6729) @@ -90,7 +90,7 @@ <include name="**/mimepull.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> - <include name="**/sjsxp.jar"/> + <include name="**/sjsxp.jar"/> <include name="**/stax-ex.jar"/> <include name="**/stax-utils.jar"/> <include name="**/streambuffer.jar"/> @@ -153,49 +153,51 @@ </copy> </sequential> </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deployers --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deployers50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-jboss50.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-deployer-beans.xml"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deploy --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deploy50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-jboss50-container.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - + <!-- ================================================================== --> + <!-- Deploy Deployers --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-deployer-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deploy --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deploy50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> @@ -219,60 +221,50 @@ <macrodef name="macro-deploy-jbossws-client"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy> </sequential> </macrodef> - - <macrodef name="macro-deploy-jbossws-client42"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-jboss42.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - + <!-- ================================================================== --> <!-- Deploy Server Lib --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-server-lib"> + <macrodef name="macro-deploy-jbossws-server-lib42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy> </sequential> </macrodef> - - <macrodef name="macro-deploy-jbossws-server-lib42"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-jboss42.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - + + <macrodef name="macro-deploy-jbossws-server-lib50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> @@ -281,6 +273,7 @@ <attribute name="thirdpartydir"/> <attribute name="resourcesdir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> @@ -300,12 +293,12 @@ </unzip> <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-metro42-beans.xml"/> + <include name=&quot;**/jbossws-(a){jbossid}-beans.xml&quot;/&gt; </fileset> </copy> - <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-metro42-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; - <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{resourcesdir}/META-INF"/> + <move file=&quot;@{targetdir}/jbossws.beans/META-INF/jbossws-(a){jbossid}-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir=&quot;@{resourcesdir}/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; </copy> </sequential> </macrodef> @@ -313,6 +306,7 @@ <macrodef name="macro-deploy-jbossws-metro50-sar"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> @@ -326,12 +320,11 @@ <include name="**/jbossws-context.war"/> </fileset> </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-metro50-beans.xml"/> + <include name=&quot;**/jbossws-(a){jbossid}-beans.xml&quot;/&gt; </fileset> </copy> - <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-metro50-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; </sequential> </macrodef> @@ -343,23 +336,22 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}" + jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> @@ -377,14 +369,29 @@ <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/> - <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/> - <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/> + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + <!-- delete stale container integration jars --> <delete> - <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> </delete> + + <!-- delete content of last deployment --> + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + + <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> + </sequential> </macrodef> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-28 16:34:40 UTC (rev 6728) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-28 20:23:02 UTC (rev 6729) @@ -10,19 +10,19 @@ <project> - <property name="tests.output.dir" value="${metro.dir}/output/tests"/> + <property name="tests.output.dir" value="${stack.dir}/output/tests"/> - <import file="${metro.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <import file="${stack.dir}/src/test-framework/ant-import/build-testsuite.xml"/> <!-- Define excluded tests --> <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> - <property name="excludesfile" value="${metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${stack.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - <property name="tests.dir" value="${metro.dir}/src/test"/> + <property name="tests.dir" value="${stack.dir}/src/test"/> <property name="tests.java.dir" value="${tests.dir}/java"/> <property name="tests.resources.dir" value="${tests.dir}/resources"/> - <property name="tests.framework.dir" value="${metro.dir}/src/test-framework"/> + <property name="tests.framework.dir" value="${stack.dir}/src/test-framework"/> <property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/> <!-- @@ -31,32 +31,32 @@ <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.metro.dir}/output/lib/jboss-wsit-tools.jar"/> - <pathelement location="${int.metro.dir}/output/lib/jboss-wsit-rt.jar"/> + <pathelement location="${stack.dir}/output/lib/jboss-wsit-tools.jar"/> + <pathelement location="${stack.dir}/output/lib/jboss-wsit-rt.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/FastInfoset.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/http.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/mimepull.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/sjsxp.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/streambuffer.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/wsit-resolver.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/xws-security.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/xmlsec.jar"/> + <pathelement location="${stack.dir}/thirdparty/FastInfoset.jar"/> + <pathelement location="${stack.dir}/thirdparty/http.jar"/> + <pathelement location="${stack.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${stack.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${stack.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${stack.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${stack.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${stack.dir}/thirdparty/mimepull.jar"/> + <pathelement location="${stack.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${stack.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${stack.dir}/thirdparty/sjsxp.jar"/> + <pathelement location="${stack.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${stack.dir}/thirdparty/streambuffer.jar"/> + <pathelement location="${stack.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${stack.dir}/thirdparty/wsit-resolver.jar"/> + <pathelement location="${stack.dir}/thirdparty/wstx.jar"/> + <pathelement location="${stack.dir}/thirdparty/xws-security.jar"/> + <pathelement location="${stack.dir}/thirdparty/xmlsec.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.metro.dir}/output/lib/jbossws-metro-client.jar"/> - <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${stack.dir}/output/lib/jbossws-metro-client.jar"/> + <pathelement location="${stack.dir}/thirdparty/jbossws-framework.jar"/> </path> </target> @@ -84,8 +84,8 @@ <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources"> <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${metro.dir}/src/test/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${stack.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${stack.dir}/src/test/java" excludesfile="${excludesfile}"/> </target> <!-- ================================================================== --> @@ -94,15 +94,15 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${metro.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${metro.dir}/src/test"/> + <macro-copy-resources srcdir="${stack.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${stack.dir}/src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${metro.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> - <ant antfile="${metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${metro.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${stack.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${stack.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${stack.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${stack.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-04-28 16:34:40 UTC (rev 6728) +++ stack/metro/trunk/build.xml 2008-04-28 20:23:02 UTC (rev 6729) @@ -13,7 +13,7 @@ <project default="main" basedir="." name="JBossWS-Metro"> - <property name="int.metro.dir" value="${basedir}"/> + <property name="stack.dir" value="${basedir}"/> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-bin-dist.xml"/> @@ -27,25 +27,24 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="metro.dir" value="${int.metro.dir}"/> - <property name="metro.src.dir" value="${metro.dir}/src/main"/> - <property name="metro.distro.dir" value="${metro.src.dir}/distro"/> - <property name="metro.etc.dir" value="${metro.src.dir}/etc"/> - <property name="metro.java.dir" value="${metro.src.dir}/java"/> - <property name="metro.resources.dir" value="${metro.src.dir}/resources"/> - <property name="metro.output.dir" value="${metro.dir}/output"/> - <property name="metro.output.apidocs.dir" value="${metro.output.dir}/apidocs"/> - <property name="metro.output.classes.dir" value="${metro.output.dir}/classes"/> - <property name="metro.output.deploy.dir" value="${metro.output.dir}/deploy"/> - <property name="metro.output.etc.dir" value="${metro.output.dir}/etc"/> - <property name="metro.output.lib.dir" value="${metro.output.dir}/lib"/> - <property name="metro.output.resources.dir" value="${metro.output.dir}/resources"/> + <property name="stack.src.dir" value="${stack.dir}/src/main"/> + <property name="stack.distro.dir" value="${stack.src.dir}/distro"/> + <property name="stack.etc.dir" value="${stack.src.dir}/etc"/> + <property name="stack.java.dir" value="${stack.src.dir}/java"/> + <property name="stack.resources.dir" value="${stack.src.dir}/resources"/> + <property name="stack.output.dir" value="${stack.dir}/output"/> + <property name="stack.output.apidocs.dir" value="${stack.output.dir}/apidocs"/> + <property name="stack.output.classes.dir" value="${stack.output.dir}/classes"/> + <property name="stack.output.deploy.dir" value="${stack.output.dir}/deploy"/> + <property name="stack.output.etc.dir" value="${stack.output.dir}/etc"/> + <property name="stack.output.lib.dir" value="${stack.output.dir}/lib"/> + <property name="stack.output.resources.dir" value="${stack.output.dir}/resources"/> - <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="deploy.artifacts.dir" value="${stack.output.deploy.dir}-artifacts"/> + <property name="deploy.structure.jboss42" value="${stack.output.deploy.dir}-jboss42"/> + <property name="deploy.structure.jboss50" value="${stack.output.deploy.dir}-jboss50"/> + <property name="jbossws.default.deploy.conf" value="${stack.dir}/ant-import/jbossws-default-deploy.conf"/> + <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> <!-- ================================================================== --> @@ -72,19 +71,19 @@ <!-- Compile java sources --> <target name="compile-classes" depends="compile-classes-metro"/> <target name="compile-classes-metro" depends="init"> - <mkdir dir="${metro.output.classes.dir}"/> - <javac srcdir="${metro.java.dir}" sourcepath="" destdir="${metro.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <mkdir dir="${stack.output.classes.dir}"/> + <javac srcdir="${stack.java.dir}" sourcepath="" destdir="${stack.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/wsf/stack/metro/**"/> - <classpath refid="metro.integration.classpath"/> + <classpath refid="stack.integration.classpath"/> </javac> </target> <!-- Compile etc files (manifests and such) --> <target name="compile-etc" depends="init"> - <mkdir dir="${metro.output.etc.dir}"/> - <copy todir="${metro.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${metro.etc.dir}"> + <mkdir dir="${stack.output.etc.dir}"/> + <copy todir="${stack.output.etc.dir}" filtering="yes" overwrite="true"> + <fileset dir="${stack.etc.dir}"> <include name="component-info.xml"/> <include name="default.mf"/> </fileset> @@ -93,54 +92,73 @@ <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${int.metro.dir}/version.properties"/> + <filtersfile file="${stack.dir}/version.properties"/> </filterset> </copy> </target> <!-- Compile resource files --> - + <!-- Compile resource files --> - <target name="compile42-resources" if="jbossws.integration.jboss42"> - <mkdir dir="${metro.output.resources.dir}"/> - <!-- Concat jboss-beans.xml --> - <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - <concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; - </header> - <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> - <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - </target> - - - <target name="compile50-resources" if="jbossws.integration.jboss50"> - <mkdir dir="${metro.output.resources.dir}"/> - <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${metro.output.resources.dir}"/> - - <!-- Concat jbossws-native50-beans.xml --> - <concat destfile="${metro.output.resources.dir}/jbossws-metro50-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; - </header> - <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - </target> - + <target name="compile42-resources" if="jbossws.integration.jboss42"> + + <unzip dest="${stack.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/> + <unzip dest="${stack.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/> + + <!-- Concat jbossws-jboss422-beans.xml --> + <concat destfile="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss422-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"&gt; </header> + <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/> + <fileset file="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + + <!-- Concat jbossws-jboss423-beans.xml --> + <concat destfile="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss423-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"&gt; </header> + <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/> + <fileset file="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + + </target> + + <target name="compile50-resources" if="jbossws.integration.jboss50"> + + <unzip dest="${stack.output.resources.dir}/jbossws-jboss500" src="${thirdparty.dir}/jbossws-jboss500-resources.zip"/> + <unzip dest="${stack.output.resources.dir}/jbossws-jboss501" src="${thirdparty.dir}/jbossws-jboss501-resources.zip"/> + + <!-- Concat jbossws-jboss500-beans.xml --> + <concat destfile="${stack.output.resources.dir}/jbossws-jboss500/jbossws-jboss500-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + + <!-- Concat jbossws-jboss501-beans.xml --> + <concat destfile="${stack.output.resources.dir}/jbossws-jboss501/jbossws-jboss501-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + </target> + <target name="compile-resources" depends="init, compile42-resources, compile50-resources"> - - <copy todir="${metro.output.resources.dir}"> - <fileset dir="${metro.resources.dir}"> + + <copy todir="${stack.output.resources.dir}"> + <fileset dir="${stack.resources.dir}"> <include name="jbossws-metro.jar/**"/> - <include name="jbossws-metro.sar/**"/> + <include name="jbossws-stack.sar/**"/> </fileset> </copy> </target> @@ -155,51 +173,50 @@ <target name="jars" depends="compile" description="Builds all jar files."> <!-- Build jbossws-metro.jar --> - <mkdir dir="${metro.output.lib.dir}"/> - <jar jarfile="${metro.output.lib.dir}/jbossws-metro.jar" manifest="${metro.output.etc.dir}/default.mf"> - <fileset dir="${metro.output.classes.dir}"> + <mkdir dir="${stack.output.lib.dir}"/> + <jar jarfile="${stack.output.lib.dir}/jbossws-metro.jar" manifest="${stack.output.etc.dir}/default.mf"> + <fileset dir="${stack.output.classes.dir}"> <include name="org/jboss/wsf/stack/metro/injection/**"/> <include name="org/jboss/wsf/stack/metro/client/**"/> <include name="org/jboss/wsf/stack/metro/metadata/**"/> <include name="org/jboss/wsf/stack/metro/log/**"/> <include name="org/jboss/wsf/stack/metro/*"/> </fileset> - <metainf dir="${metro.resources.dir}/jbossws-metro.jar/META-INF"/> + <metainf dir="${stack.resources.dir}/jbossws-metro.jar/META-INF"/> </jar> <!-- jbossws-metro-client.jar --> - <jar jarfile="${metro.output.lib.dir}/jbossws-metro-client.jar" manifest="${metro.output.etc.dir}/default.mf"> - <fileset dir="${metro.output.classes.dir}"> + <jar jarfile="${stack.output.lib.dir}/jbossws-metro-client.jar" manifest="${stack.output.etc.dir}/default.mf"> + <fileset dir="${stack.output.classes.dir}"> <include name="org/jboss/wsf/stack/metro/client/**"/> <include name="org/jboss/wsf/stack/metro/tools/**"/> </fileset> - <metainf dir="${metro.resources.dir}/jbossws-metro-client.jar/META-INF"/> + <metainf dir="${stack.resources.dir}/jbossws-metro-client.jar/META-INF"/> </jar> <!-- Build jbossws-context.war --> - <copy todir="${metro.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true"> - <fileset dir="${metro.resources.dir}/jbossws-context.war"/> + <copy todir="${stack.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true"> + <fileset dir="${stack.resources.dir}/jbossws-context.war"/> <filterset> <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${metro.dir}/version.properties"/> + <filtersfile file="${stack.dir}/version.properties"/> </filterset> </copy> - <war warfile="${metro.output.lib.dir}/jbossws-context.war" - webxml="${metro.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml" - manifest="${metro.output.etc.dir}/default.mf"> - <fileset dir="${metro.output.resources.dir}/jbossws-context.war"> + <war warfile="${stack.output.lib.dir}/jbossws-context.war" webxml="${stack.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml" + manifest="${stack.output.etc.dir}/default.mf"> + <fileset dir="${stack.output.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${metro.output.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${stack.output.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> <!-- Build jbossws-metro-src.zip --> - <zip zipfile="${metro.output.lib.dir}/jbossws-metro-src.zip"> - <fileset dir="${metro.java.dir}"/> + <zip zipfile="${stack.output.lib.dir}/jbossws-metro-src.zip"> + <fileset dir="${stack.java.dir}"/> </zip> </target> @@ -207,20 +224,20 @@ <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> <!-- expand the metro sources --> - <mkdir dir="${metro.output.dir}/thirdparty-sources"/> - <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${metro.output.dir}/thirdparty-sources"/> + <mkdir dir="${stack.output.dir}/thirdparty-sources"/> + <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${stack.output.dir}/thirdparty-sources"/> - <mkdir dir="${metro.output.apidocs.dir}"/> - <javadoc destdir="${metro.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <mkdir dir="${stack.output.apidocs.dir}"/> + <javadoc destdir="${stack.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> <classpath> <pathelement path="${metro50.integration.classpath}"/> - <pathelement path="${metro.integration.classpath}"/> + <pathelement path="${stack.integration.classpath}"/> </classpath> - <packageset dir="${metro.java.dir}" defaultexcludes="yes"> + <packageset dir="${stack.java.dir}" defaultexcludes="yes"> <include name="org/jboss/wsf/**"/> </packageset> - <packageset dir="${metro.output.dir}/thirdparty-sources" defaultexcludes="yes"> + <packageset dir="${stack.output.dir}/thirdparty-sources" defaultexcludes="yes"> <include name="com/sun/**"/> </packageset> @@ -228,6 +245,7 @@ </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*"/--> <group title="Stack integration" packages="org.jboss.wsf.stack*"/> <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/> @@ -241,11 +259,11 @@ <!-- ================================================================== --> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${metro.output.dir}"/> + <delete dir="${stack.output.dir}"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.metro.dir}/thirdparty"/> + <delete dir="${stack.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/>