Author: thomas.diesler(a)jboss.com
Date: 2008-03-19 14:16:18 -0400 (Wed, 19 Mar 2008)
New Revision: 6025
Removed:
stack/metro/trunk/ant-import/build-metro.xml
stack/metro/trunk/ant-import/metro-build-adapter.xml
Modified:
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/build.xml
stack/metro/trunk/version.properties
Log:
Refactore build to be inline with CXF build
Deleted: stack/metro/trunk/ant-import/build-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/build-metro.xml 2008-03-19 16:36:29 UTC (rev 6024)
+++ stack/metro/trunk/ant-import/build-metro.xml 2008-03-19 18:16:18 UTC (rev 6025)
@@ -1,91 +0,0 @@
-<?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$ -->
-
-<project basedir="." name="Build-Metro">
-
- <property name="cvs.dir" value="glassfish-metro"/>
- <property name="metro.repository.dir"
value="${cvs.dir}/wsit/wsit"/>
-
- <macrodef name="antbridge">
- <attribute name="target" default="main"/>
- <attribute name="file" default="build.xml"/>
- <sequential>
- <exec dir="${metro.repository.dir}" executable="ant"
failonerror="true">
- <arg value="@{target}"/>
- <arg value="-f"/>
- <arg value="@{file}"/>
- </exec>
- </sequential>
- </macrodef>
-
- <target name="-cvs.init">
- <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"
- description="Checkout/Update the local metro sources">
-
- <mkdir dir="${cvs.dir}"/>
-
- <echo>**********************************</echo>
- <echo>CVS out to: ${cvs.dir}</echo>
- <echo>**********************************</echo>
-
- <cvs cvsRoot=":pserver:${cvs.user}@cvs.dev.java.net:/cvs"
- package="wsit/wsit"
- dest="${cvs.dir}"
- tag="${cvs.tag}"
- failonerror="true"
- />
-
- <touch file="${cvs.dir}/build-marker-${cvs.tag}"/>
-
- </target>
-
- <target name="-cvs.message" if="same.checkout">
- <echo>**********************************</echo>
- <echo>No checkout required.</echo>
- <echo>Using same CVS tag: ${cvs.tag} </echo>
- <echo>To force a checkout run 'ant clean.cvs'</echo>
- <echo>**********************************</echo>
- </target>
-
- <target name="install.adapter" depends="init">
- <copy todir="${metro.repository.dir}"
file="ant-import/metro-build-adapter.xml" overwrite="true"
verbose="true"/>
- </target>
-
- <target name="clean.metro" description="Cleanup the metro native
build">
- <antbridge target="clean"/>
- <delete dir="glassfish-metro/output"/>
- </target>
-
- <target name="clean.cvs" description="Cleanup the current CVS
checkout">
- <delete dir="${cvs.dir}"/>
- </target>
-
- <target name="check.metro">
- <available file="glassfish-metro/metro.build.marker"
property="metro.build.exists"/>
- </target>
-
- <target name="build.metro" depends="check.metro"
unless="metro.build.exists">
- <antcall target="checkout"/>
- <antcall target="install.adapter"/>
- <antcall target="clean.metro"/>
- <antbridge target="copy-binaries"
file="metro-build-adapter.xml"/>
- <echo>*********************************</echo>
- <echo>The metro binaries have been copied to
'glassfish-metro/output'</echo>
- <echo>*********************************</echo>
- <touch file="glassfish-metro/metro.build.marker"/>
- </target>
-
-</project>
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-19 16:36:29 UTC (rev 6024)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-19 18:16:18 UTC (rev 6025)
@@ -12,17 +12,23 @@
<!-- $Id$ -->
<project>
-
+
<property file="${int.metro.dir}/version.properties"/>
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
-
+
<target name="thirdparty" depends="thirdparty-classpath">
</target>
<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="thirdparty.dir"
value="${int.metro.dir}/thirdparty"/>
<checksum file="${int.metro.dir}/version.properties"
fileext=".md5" verifyproperty="checksum.ok"/>
<condition property="force.thirdparty.get">
@@ -36,41 +42,46 @@
</target>
<!--
- thirdpartry-get
+ thirdpartry-get
-->
- <target name="thirdparty-get" depends="thirdparty-init"
if="force.thirdparty.get"
- description="Gets the thirdparty libraries">
-
+ <target name="thirdparty-get" depends="thirdparty-init,
metro-copy-jars" if="force.thirdparty.get" 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-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-resources.zip"
dest="${thirdparty.dir}/jbossws-jboss42-resources.zip"
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}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar"
dest="${thirdparty.dir}/wsdl4j.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}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar"
dest="${thirdparty.dir}/wsdl4j.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/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar"
dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar"
dest="${thirdparty.dir}/junit.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-fi/${sun-fi}/lib/FastInfoset.jar"
dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-fi/${sun-fi}/lib/FastInfoset.jar"
dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar"
dest="${thirdparty.dir}/activation.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"/>
- <get
src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar"
dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true"
verbose="true"/>
+ <get
src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar"
dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/http.jar"
dest="${thirdparty.dir}/http.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar"
dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-src.zip"
dest="${thirdparty.dir}/jaxws-src.zip" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-src.zip"
dest="${thirdparty.dir}/jaxws-src.zip" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar"
dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar"
dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr173_api.jar"
dest="${thirdparty.dir}/jsr173_api.jar" usetimestamp="true"
verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar"
dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true"
verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar"
dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr250-api.jar"
dest="${thirdparty.dir}/jsr250-api.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/mimepull.jar"
dest="${thirdparty.dir}/mimepull.jar" usetimestamp="true"
verbose="true"/>
- <!--get
src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/resolver.jar"
dest="${thirdparty.dir}/resolver.jar" usetimestamp="true"
verbose="true"/-->
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar"
dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar"
dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar"
dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true"
verbose="true"/>
@@ -86,7 +97,7 @@
<!-- The compile classpath for jboss50 integration -->
<path id="metro.integration.classpath">
- <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar
-->
+ <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar
-->
<pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
@@ -94,7 +105,7 @@
<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-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
@@ -111,5 +122,98 @@
</path>
</target>
-
+
+ <!-- Build metro from source -->
+ <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>
+
+ <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>
+
+ <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>
+
+ <target name="metro-build-required" depends="metro-checkout-dir"
if="glassfish.metro.available">
+ <available property="metro.build.available"
file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}"
type="file"/>
+ <echo message="metro.build.available=${metro.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>
+
+ <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"/>
+ </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">
+ <include name="*.TWSDLExtensionHandler"/>
+ </fileset>
+ </copy>
+ <zip basedir="${metro.output.lib.dir}/jboss-wsit-tools"
destfile="${metro.output.lib.dir}/jboss-wsit-tools.jar"/>
+ </target>
+
+ <!-- Copy the metro jars -->
+ <target name="metro-copy-jars"
depends="metro-cvs-build,metro-runtime-jar,metro-tools-jar">
+ <mkdir dir="${thirdparty.dir}"/>
+
+ <property name="lib.runtime.dir"
value="${glassfish.metro.dir}/wsit/wsit/lib/runtime"/>
+ <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="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="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.dir}" verbose="true"
overwrite="true">
+ <fileset dir="${lib.runtime.dir}">
+ <include name="jaxws-local-transport.jar"/>
+ <include name="stax-utils.jar"/>
+ <include name="txnannprocessor.jar"/>
+ <include name="xmldsig.jar"/>
+ <include name="xws-security.jar"/>
+ </fileset>
+ </copy>
+ <copy file="${lib.runtime.dir}/resolver.jar"
tofile="${thirdparty.dir}/wsit-resolver.jar" verbose="true"
overwrite="true"/>
+
+ <!-- Touch the build marker -->
+ <touch file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}"/>
+ </target>
+
+ <macrodef name="antbridge">
+ <attribute name="target" default="main"/>
+ <attribute name="basedir"/>
+ <sequential>
+ <exec dir="@{basedir}" executable="ant"
failonerror="true">
+ <arg value="@{target}"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
</project>
Deleted: stack/metro/trunk/ant-import/metro-build-adapter.xml
===================================================================
--- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-19 16:36:29 UTC (rev
6024)
+++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-19 18:16:18 UTC (rev
6025)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="JBossWS-BuildAdapter" default="copy-binaries"
basedir=".">
-
- <import file="properties.xml"/>
- <import file="build.xml"/>
-
- <property name="thirdparty.gen"
value="../../../output/lib"/>
- <property name="thirdparty" value="../../../thirdparty"/>
-
- <target name="adapter.init">
- <!-- Directory for metro generated jars that are not distributed through
'repository.jboss.com' -->
- <mkdir dir="${thirdparty.gen}"/>
- </target>
- <!--
- Creates the core metro extension jar:
- 'rt/build/wsit-rt.jar'
- -->
- <target name="-metro.runtime.jar" depends="main">
- <ant dir="." target="create-wsit-runtime-jar"/>
- <mkdir dir="${rt.dir}/build/jboss-tmp"/>
- <unzip src="${rt.dir}/build/wsit-rt.jar"
dest="${rt.dir}/build/jboss-tmp/"/>
- <rename src="${rt.dir}/build/jboss-tmp/WEB-INF"
dest="${rt.dir}/build/jboss-tmp/wsdl"/>
- <zip destfile="${rt.dir}/build/jboss-wsit-rt.jar"
basedir="${rt.dir}/build/jboss-tmp/"/>
- </target>
-
- <!-- build the metro tools extension -->
- <target name="-metro.tools.jar">
- <ant dir="tools" target="wsit-jars-tools">
- <property name="tools.dir" value="."/>
- </ant>
-
- <mkdir dir="${tools.dir}/build/jboss-tmp"/>
-
- <copy todir="${tools.dir}/build/jboss-tmp/META-INF/services"
overwrite="true" verbose="true">
- <fileset dir="./etc/META-INF/services">
- <include name="*.TWSDLExtensionHandler"/>
- </fileset>
- </copy>
-
- <unzip src="${tools.dir}/build/wsit-tools.jar"
dest="${tools.dir}/build/jboss-tmp/"/>
-
- <zip destfile="${tools.dir}/build/jboss-wsit-tools.jar"
basedir="${tools.dir}/build/jboss-tmp/"/>
- </target>
-
-
- <target name="metro.jars" description="Creates the metro standalone
jars" depends="init">
- <antcall target="-metro.runtime.jar"/>
- <antcall target="-metro.tools.jar"/>
- </target>
-
- <target name="copy-binaries"
- description="Builds the metro jars and copies them to
glassfish-metro/output"
- depends="clean, metro.jars">
-
-
- <!--
- 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="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="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"/>
- </fileset>
-
- <!-- tools jars -->
- <fileset dir="${tools.dir}/build/">
- <include name="jboss-wsit-tools.jar"/>
- </fileset>
-
- <!-- Metro 3rd party thats not available through
repo.jboss.com -->
-
- <fileset dir="${lib.runtime.dir}">
- <include name="jaxws-local-transport.jar"/>
- <include name="stax-utils.jar"/>
- <include name="txnannprocessor.jar"/>
- <include name="xmldsig.jar"/>
- <include name="xws-security.jar"/>
-
- <!-- a custom jarjar resolver package -->
- <include name="resolver.jar"/>
- </fileset>
- </copy>
-
-
- <!-- rename the jarjar resolver.jar -->
- <move file="${thirdparty.gen}/resolver.jar"
tofile="${thirdparty.gen}/wsit-resolver.jar"/>
-
-
- </target>
-
-</project>
\ No newline at end of file
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-03-19 16:36:29 UTC (rev 6024)
+++ stack/metro/trunk/build.xml 2008-03-19 18:16:18 UTC (rev 6025)
@@ -47,7 +47,6 @@
<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"/>
<!-- ================================================================== -->
<!-- Initialization -->
@@ -143,7 +142,7 @@
<!--
| Build all jar files.
-->
- <target name="jars" depends="build.metro,compile"
description="Builds all jar files.">
+ <target name="jars" depends="compile" description="Builds
all jar files.">
<!-- Build jbossws-metro.jar -->
<mkdir dir="${metro.output.lib.dir}"/>
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-03-19 16:36:29 UTC (rev 6024)
+++ stack/metro/trunk/version.properties 2008-03-19 18:16:18 UTC (rev 6025)
@@ -40,4 +40,4 @@
sun-javamail=1.4
# metro cvs
-cvs.tag=metro1_1-release
+metro.cvs.tag=metro1_1-release