3:24 a.m.
Author: richard.opalka(a)jboss.com
Date: 2008-02-15 04:24:49 -0500 (Fri, 15 Feb 2008)
New Revision: 5687
Added:
stack/metro/trunk/ant-import/macros-deploy-metro.xml
Removed:
stack/metro/trunk/ant-import/macros-deploy-sunri.xml
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-metro.xml
stack/metro/trunk/ant-import/build-release.xml
stack/metro/trunk/ant-import/build-testsuite.xml
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/build.xml
stack/metro/trunk/src/main/distro/bin-dist-build.xml
stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
stack/metro/trunk/src/main/etc/bin-dist-build.xml
stack/metro/trunk/src/main/etc/bin-dist-deploy.xml
Log:
[JBWS-1994] refactored macro names and properties
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -22,7 +22,7 @@
<!-- FIXME: the framework version has to be included somehow. Maybe from
jbossws-framework.jar ? -->
<property name="dist.name"
value="${specification.version}-metro-${version.id}"/>
- <property name="bindist.dir"
value="${sunri.output.dir}/jbossws-metro-dist"/>
+ <property name="bindist.dir"
value="${metro.output.dir}/jbossws-metro-dist"/>
<property name="bindist.build.dir"
value="${bindist.dir}/build"/>
<property name="bindist.bin.dir"
value="${bindist.dir}/bin"/>
<property name="bindist.lib.dir"
value="${bindist.dir}/lib"/>
@@ -38,27 +38,27 @@
<mkdir dir="${bindist.tools.dir}"/>
<!-- root -->
- <copy tofile="${bindist.dir}/ant.properties"
file="${sunri.distro.dir}/ant.properties.example">
+ <copy tofile="${bindist.dir}/ant.properties"
file="${metro.distro.dir}/ant.properties.example">
<filterset>
- <filtersfile file="${sunri.dir}/ant.properties"/>
+ <filtersfile file="${metro.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/version.properties"
file="${sunri.dir}/version.properties"/>
- <copy tofile="${bindist.dir}/build.xml"
file="${sunri.distro.dir}/bin-dist-build.xml"/>
- <copy tofile="${bindist.build.dir}/build-deploy.xml"
file="${sunri.distro.dir}/bin-dist-deploy.xml"/>
+ <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.build.dir}/build-deploy.xml"
file="${metro.distro.dir}/bin-dist-deploy.xml"/>
<!-- build -->
<copy todir="${bindist.build.dir}">
- <fileset dir="${sunri.dir}/ant-import">
+ <fileset dir="${metro.dir}/ant-import">
<include name="macros-deploy-framework.xml"/>
- <include name="macros-deploy-sunri.xml"/>
+ <include name="macros-deploy-metro.xml"/>
</fileset>
</copy>
<unzip dest="${bindist.bin.dir}"
src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${sunri.dir}/src/main/etc">
+ <fileset dir="${metro.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -68,22 +68,22 @@
<!-- docs -->
<copy todir="${bindist.docs.dir}">
- <fileset dir="${sunri.output.dir}">
+ <fileset dir="${metro.output.dir}">
<include name="apidocs/**"/>
</fileset>
</copy>
<copy todir="${bindist.docs.dir}" filtering="yes">
- <fileset dir="${sunri.distro.dir}">
+ <fileset dir="${metro.distro.dir}">
<include name="Install.txt"/>
<include name="ReleaseNotes.txt"/>
</fileset>
<filterset>
- <filtersfile file="${sunri.dir}/version.properties"/>
+ <filtersfile file="${metro.dir}/version.properties"/>
</filterset>
</copy>
<copy todir="${bindist.docs.dir}">
- <fileset dir="${sunri.etc.dir}">
+ <fileset dir="${metro.etc.dir}">
<include name="JBossORG-EULA.txt"/>
</fileset>
</copy>
@@ -96,7 +96,7 @@
<include name="jbossws-framework-scripts.zip"/>
<include name="jbossws-spi.jar"/>
</fileset>
- <fileset dir="${sunri.dir}/output/lib">
+ <fileset dir="${metro.dir}/output/lib">
<include name="jbossws-context.war"/>
<include name="jbossws-sunri.jar"/>
<include name="jbossws-sunri-client.jar"/>
@@ -131,26 +131,26 @@
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${sunri.dir}/src/test-framework"/>
- <fileset dir="${sunri.dir}/src/test">
+ <fileset dir="${metro.dir}/src/test-framework"/>
+ <fileset dir="${metro.dir}/src/test">
<include name="resources/test-excludes-*.txt"/>
</fileset>
</copy>
<!-- build tools -->
<copy todir="${bindist.tools.dir}" overwrite="true">
- <fileset dir="${sunri.dir}/tools/ant"/>
+ <fileset dir="${metro.dir}/tools/ant"/>
</copy>
<copy todir="${bindist.dir}" overwrite="true">
- <fileset dir="${sunri.dir}">
+ <fileset dir="${metro.dir}">
<include name="build.bat"/>
<include name="build.sh"/>
</fileset>
</copy>
<chmod file="${bindist.dir}/build.sh" perm="+x"/>
- <zip destfile="${sunri.output.dir}/${dist.name}.zip">
- <fileset dir="${sunri.output.dir}"
includes="jbossws-metro-dist/**"/>
+ <zip destfile="${metro.output.dir}/${dist.name}.zip">
+ <fileset dir="${metro.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-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -13,25 +13,25 @@
<project>
- <import
file="${int.sunri.dir}/ant-import/macros-deploy-framework.xml"/>
- <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
+ <import
file="${int.metro.dir}/ant-import/macros-deploy-framework.xml"/>
+ <import file="${int.metro.dir}/ant-import/macros-deploy-metro.xml"/>
<!-- ================================================================== -->
<!-- Deployment JBoss422 -->
<!-- ================================================================== -->
- <target name="deploy-jboss422"
depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/sunri
to jboss42">
- <macro-deploy-sunri422
- stacklibs="${int.sunri.dir}/output/lib"
- thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+ <target name="deploy-jboss422"
depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/metro
to jboss42">
+ <macro-deploy-metro422
+ stacklibs="${int.metro.dir}/output/lib"
+ thirdpartylibs="${int.metro.dir}/thirdparty"/>
<macro-deploy-framework
- thirdpartylibs="${int.sunri.dir}/thirdparty"
+ thirdpartylibs="${int.metro.dir}/thirdparty"
jbosshome="${jboss422.home}"/>
</target>
- <target name="undeploy-jboss422" depends="prepare"
description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri422/>
+ <target name="undeploy-jboss422" depends="prepare"
description="Remove jbossws/metro from jboss42">
+ <macro-undeploy-metro422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
@@ -39,18 +39,18 @@
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
- <target name="deploy-jboss423" depends="jars-jboss423,
undeploy-jboss423" description="Deploy jbossws/sunri to jboss42">
- <macro-deploy-sunri423
- stacklibs="${int.sunri.dir}/output/lib"
- thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+ <target name="deploy-jboss423" depends="jars-jboss423,
undeploy-jboss423" description="Deploy jbossws/metro to jboss42">
+ <macro-deploy-metro423
+ stacklibs="${int.metro.dir}/output/lib"
+ thirdpartylibs="${int.metro.dir}/thirdparty"/>
<macro-deploy-framework
- thirdpartylibs="${int.sunri.dir}/thirdparty"
+ thirdpartylibs="${int.metro.dir}/thirdparty"
jbosshome="${jboss423.home}"/>
</target>
- <target name="undeploy-jboss423" depends="prepare"
description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri423/>
+ <target name="undeploy-jboss423" depends="prepare"
description="Remove jbossws/metro from jboss42">
+ <macro-undeploy-metro423/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
@@ -58,18 +58,18 @@
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
- <target name="deploy-jboss500"
depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri
to jboss50">
- <macro-deploy-sunri500
- stacklibs="${int.sunri.dir}/output/lib"
- thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+ <target name="deploy-jboss500"
depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/metro
to jboss50">
+ <macro-deploy-metro500
+ stacklibs="${int.metro.dir}/output/lib"
+ thirdpartylibs="${int.metro.dir}/thirdparty"/>
<macro-deploy-framework
- thirdpartylibs="${int.sunri.dir}/thirdparty"
+ thirdpartylibs="${int.metro.dir}/thirdparty"
jbosshome="${jboss500.home}"/>
</target>
- <target name="undeploy-jboss500" depends="prepare"
description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri500/>
+ <target name="undeploy-jboss500" depends="prepare"
description="Remove jbossws/metro from jboss50">
+ <macro-undeploy-metro500/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
@@ -77,18 +77,18 @@
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
- <target name="deploy-jboss501"
depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/sunri
to jboss50">
- <macro-deploy-sunri501
- stacklibs="${int.sunri.dir}/output/lib"
- thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+ <target name="deploy-jboss501"
depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/metro
to jboss50">
+ <macro-deploy-metro501
+ stacklibs="${int.metro.dir}/output/lib"
+ thirdpartylibs="${int.metro.dir}/thirdparty"/>
<macro-deploy-framework
- thirdpartylibs="${int.sunri.dir}/thirdparty"
+ thirdpartylibs="${int.metro.dir}/thirdparty"
jbosshome="${jboss501.home}"/>
</target>
- <target name="undeploy-jboss501" depends="prepare"
description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri501/>
+ <target name="undeploy-jboss501" depends="prepare"
description="Remove jbossws/metro from jboss50">
+ <macro-undeploy-metro501/>
<macro-undeploy-framework jbosshome="${jboss501.home}"/>
</target>
Modified: stack/metro/trunk/ant-import/build-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/build-metro.xml 2008-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/ant-import/build-metro.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -14,13 +14,13 @@
<project basedir="." name="Build-Metro">
<property name="cvs.dir" value="cvs"/>
- <property name="metro.dir" value="${cvs.dir}/wsit/wsit"/>
+ <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.dir}" executable="ant"
failonerror="true">
+ <exec dir="${metro.repository.dir}" executable="ant"
failonerror="true">
<arg value="@{target}"/>
<arg value="-f"/>
<arg value="@{file}"/>
@@ -61,7 +61,7 @@
</target>
<target name="-install.adapter" depends="init">
- <copy todir="${metro.dir}"
file="ant-import/metro-build-adapter.xml" overwrite="true"
verbose="true"/>
+ <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">
Modified: stack/metro/trunk/ant-import/build-release.xml
===================================================================
--- stack/metro/trunk/ant-import/build-release.xml 2008-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/ant-import/build-release.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -20,12 +20,12 @@
<property name="jboss.repository.dir"
value="${jboss.local.repository}/jboss"/>
<mkdir
dir="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/lib"/>
<copy
todir="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/lib"
overwrite="true">
- <fileset dir="${int.sunri.dir}/output/lib">
+ <fileset dir="${int.metro.dir}/output/lib">
<include name="jbossws-sunri50.sar"/>
<include name="jbossws-sunri50-deployer.zip"/>
</fileset>
</copy>
- <copy
tofile="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/component-info.xml"
file="${sunri.etc.dir}/component-info50.xml" filtering="true"
overwrite="true">
+ <copy
tofile="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/component-info.xml"
file="${metro.etc.dir}/component-info50.xml" filtering="true"
overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
Modified: stack/metro/trunk/ant-import/build-testsuite.xml
===================================================================
--- stack/metro/trunk/ant-import/build-testsuite.xml 2008-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/ant-import/build-testsuite.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -10,12 +10,12 @@
<project>
- <property name="tests.output.dir"
value="${int.sunri.dir}/output/tests"/>
+ <property name="tests.output.dir"
value="${int.metro.dir}/output/tests"/>
- <import
file="${int.sunri.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
+ <import
file="${int.metro.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
<!-- Define excludesfile -->
- <property name="excludesfile"
value="${int.sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+ <property name="excludesfile"
value="${int.metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
@@ -24,30 +24,30 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement
location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jaxrpc-api.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/streambuffer.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.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/FastInfoset.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/http.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty/jaxrpc-api.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/jsr173_api.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty/jsr250-api.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/resolver.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/wstx.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/>
</path>
<path id="tests.extra.classpath">
- <pathelement
location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/>
+ <pathelement
location="${int.metro.dir}/output/lib/jbossws-sunri-client.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/>
</path>
</target>
@@ -57,8 +57,8 @@
<!-- ================================================================== -->
<target name="tests-compile" depends="tests-init"
description="Compile sources">
- <macro-compile-classes srcdir="${int.sunri.dir}/src/test-framework/java"
excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${int.sunri.dir}/src/test/java"
excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${int.metro.dir}/src/test-framework/java"
excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${int.metro.dir}/src/test/java"
excludesfile="${excludesfile}"/>
</target>
<!-- ================================================================== -->
@@ -67,12 +67,12 @@
<!-- Copy resources -->
<target name="tests-copy-resources" depends="tests-init"
description="Copy the deployment resources.">
- <macro-copy-resources srcdir="${int.sunri.dir}/src/test-framework"/>
- <macro-copy-resources srcdir="${int.sunri.dir}/src/test"/>
+ <macro-copy-resources srcdir="${int.metro.dir}/src/test-framework"/>
+ <macro-copy-resources srcdir="${int.metro.dir}/src/test"/>
</target>
<target name="tests-jars"
depends="tests-compile,tests-copy-resources" description="Build the
deployments.">
- <ant
antfile="${int.sunri.dir}/src/test-framework/ant-import/build-jars-jaxws.xml"
target="build-jars-jaxws"/>
+ <ant
antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml"
target="build-jars-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars"
description="Build the deployments."/>
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -13,7 +13,7 @@
<project>
- <property file="${int.sunri.dir}/version.properties"/>
+ <property file="${int.metro.dir}/version.properties"/>
<!-- ========= -->
<!-- Libraries -->
@@ -23,8 +23,8 @@
</target>
<target name="thirdparty-init" depends="prepare">
- <property name="thirdparty.dir"
value="${int.sunri.dir}/thirdparty"/>
- <checksum file="${int.sunri.dir}/version.properties"
fileext=".md5" verifyproperty="checksum.ok"/>
+ <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">
<or>
<not>
@@ -78,13 +78,13 @@
<get
src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar"
dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true"
verbose="true"/>
<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}/woodstox/${woodstox}/lib/wstx.jar"
dest="${thirdparty.dir}/wstx.jar" usetimestamp="true"
verbose="true"/>
- <checksum file="${int.sunri.dir}/version.properties"
fileext=".md5"/>
+ <checksum file="${int.metro.dir}/version.properties"
fileext=".md5"/>
</target>
<target name="thirdparty-classpath"
depends="thirdparty-get">
<!-- The compile classpath for jboss50 integration -->
- <path id="sunri.integration.classpath">
+ <path id="metro.integration.classpath">
<!-- 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"/>
@@ -104,8 +104,8 @@
</path>
<!-- The compile classpath for jboss50 integration -->
- <path id="sunri50.integration.classpath">
- <path refid="sunri.integration.classpath"/>
+ <path id="metro50.integration.classpath">
+ <path refid="metro.integration.classpath"/>
<pathelement location="${jboss500.server.lib}/jboss.jar"/>
</path>
Added: stack/metro/trunk/ant-import/macros-deploy-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-metro.xml (rev 0)
+++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-15 09:24:49 UTC (rev
5687)
@@ -0,0 +1,279 @@
+<?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>
+
+ <patternset id="client.stack.patternset">
+ <include name="jbossws-sunri-client.jar"/>
+ </patternset>
+
+ <patternset id="client.patternset">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ </patternset>
+
+ <patternset id="lib.patternset">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </patternset>
+
+ <patternset id="serverlib.patternset">
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ </patternset>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-metro422">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss422.available.file}"
unless="jboss422.available"/>
+ <copy todir="${jboss422.home}/client"
overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <patternset refid="client.stack.patternset"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss422.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </copy>
+ <mkdir
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar
dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri42.sar"/>
+ <mkdir
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip
dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/metro from jboss422 -->
+ <macrodef name="macro-undeploy-metro422">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss422.home}/client">
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss422.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </delete>
+
+ <delete
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-metro423">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss423.available.file}"
unless="jboss423.available"/>
+ <copy todir="${jboss423.home}/client"
overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <patternset refid="client.stack.patternset"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss423.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </copy>
+ <mkdir
dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar
dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri42.sar"/>
+ <mkdir
dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip
dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/metro from jboss423 -->
+ <macrodef name="macro-undeploy-metro423">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss423.home}/client">
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss423.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </delete>
+
+ <delete
dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete
dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-metro500">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss500.available.file}"
unless="jboss500.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss500.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <patternset refid="client.stack.patternset"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss500.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib"
overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="serverlib.patternset"/>
+ </fileset>
+ </copy>
+
+ <mkdir
dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar
dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri50.sar"/>
+ <mkdir
dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip
dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/metro from jboss500 -->
+ <macrodef name="macro-undeploy-metro500">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss500.home}/client">
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss500.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset
dir="${jboss500.home}/server/${jboss.server.instance}/lib">
+ <patternset refid="serverlib.patternset"/>
+ </fileset>
+ </delete>
+
+ <delete
dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete
dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-metro501">
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss501.available.file}"
unless="jboss501.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss501.home}/client" overwrite="true">
+ <fileset dir="@{stacklibs}">
+ <patternset refid="client.stack.patternset"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
+ <copy todir="${jboss501.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </copy>
+
+ <!--SERVER JARS -->
+ <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib"
overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <patternset refid="serverlib.patternset"/>
+ </fileset>
+ </copy>
+
+ <mkdir
dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar
dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri50.sar"/>
+ <mkdir
dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip
dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/metro from jboss501 -->
+ <macrodef name="macro-undeploy-metro501">
+ <sequential>
+ <delete>
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss501.home}/client">
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ </fileset>
+
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss501.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset
dir="${jboss501.home}/server/${jboss.server.instance}/lib">
+ <patternset refid="serverlib.patternset"/>
+ </fileset>
+ </delete>
+
+ <delete
dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <delete
dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+</project>
Property changes on: stack/metro/trunk/ant-import/macros-deploy-metro.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/metro/trunk/ant-import/macros-deploy-sunri.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-14 18:24:48 UTC (rev
5686)
+++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-15 09:24:49 UTC (rev
5687)
@@ -1,279 +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>
-
- <patternset id="client.stack.patternset">
- <include name="jbossws-sunri-client.jar"/>
- </patternset>
-
- <patternset id="client.patternset">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- </patternset>
-
- <patternset id="lib.patternset">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </patternset>
-
- <patternset id="serverlib.patternset">
- <include name="jaxws-api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="saaj-api.jar"/>
- </patternset>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-sunri422">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss422.available.file}"
unless="jboss422.available"/>
- <copy todir="${jboss422.home}/client"
overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.stack.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
- <copy todir="${jboss422.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
- <mkdir
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar
dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri42.sar"/>
- <mkdir
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip
dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/sunri from jboss422 -->
- <macrodef name="macro-undeploy-sunri422">
- <sequential>
- <delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss422.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss422.home}/lib">
- <patternset refid="lib.patternset"/>
- </fileset>
- </delete>
-
- <delete
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <delete
dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-sunri423">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss423.available.file}"
unless="jboss423.available"/>
- <copy todir="${jboss423.home}/client"
overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.stack.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
- <copy todir="${jboss423.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
- <mkdir
dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar
dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri42.sar"/>
- <mkdir
dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip
dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/sunri from jboss423 -->
- <macrodef name="macro-undeploy-sunri423">
- <sequential>
- <delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss423.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss423.home}/lib">
- <patternset refid="lib.patternset"/>
- </fileset>
- </delete>
-
- <delete
dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <delete
dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-sunri500">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss500.available.file}"
unless="jboss500.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss500.home}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.stack.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss500.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
-
- <!--SERVER JARS -->
- <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="serverlib.patternset"/>
- </fileset>
- </copy>
-
- <mkdir
dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar
dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri50.sar"/>
- <mkdir
dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip
dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/sunri from jboss500 -->
- <macrodef name="macro-undeploy-sunri500">
- <sequential>
- <delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss500.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss500.home}/lib">
- <patternset refid="lib.patternset"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset
dir="${jboss500.home}/server/${jboss.server.instance}/lib">
- <patternset refid="serverlib.patternset"/>
- </fileset>
- </delete>
-
- <delete
dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <delete
dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-sunri501">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss501.available.file}"
unless="jboss501.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss501.home}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.stack.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss501.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
-
- <!--SERVER JARS -->
- <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="serverlib.patternset"/>
- </fileset>
- </copy>
-
- <mkdir
dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar
dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri50.sar"/>
- <mkdir
dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip
dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"
src="(a){thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/sunri from jboss501 -->
- <macrodef name="macro-undeploy-sunri501">
- <sequential>
- <delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss501.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss501.home}/lib">
- <patternset refid="lib.patternset"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset
dir="${jboss501.home}/server/${jboss.server.instance}/lib">
- <patternset refid="serverlib.patternset"/>
- </fileset>
- </delete>
-
- <delete
dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <delete
dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
-</project>
Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-14 18:24:48 UTC (rev
5686)
+++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-15 09:24:49 UTC (rev
5687)
@@ -10,15 +10,15 @@
<project>
- <property name="tests.output.dir"
value="${sunri.dir}/output/tests"/>
+ <property name="tests.output.dir"
value="${metro.dir}/output/tests"/>
- <import
file="${sunri.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
+ <import
file="${metro.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="${sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+ <property name="excludesfile"
value="${metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
- <property name="tests.dir" value="${sunri.dir}/src/test"/>
+ <property name="tests.dir" value="${metro.dir}/src/test"/>
<property name="tests.java.dir" value="${tests.dir}/java"/>
<property name="tests.resources.dir"
value="${tests.dir}/resources"/>
@@ -28,36 +28,36 @@
<target name="tests-init"
depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement
location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jaxws-rt.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/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.sunri.dir}/thirdparty/jaxws-tools.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-tools.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-rt.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/mimepull.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}/thirdparty/mimepull.jar"/>
- <!--pathelement
location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/-->
- <pathelement
location="${int.sunri.dir}/thirdparty/resolver.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/saaj-api.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/stax-ex.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/streambuffer.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/>
+ <!--pathelement
location="${int.metro.dir}/thirdparty/jsr173_api.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty/jsr250-api.jar"/-->
+ <pathelement
location="${int.metro.dir}/thirdparty/resolver.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/wstx.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty/wsdl4j.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty-gen/xws-security.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty-gen/xws-security.jar"/>
</path>
<path id="tests.extra.classpath">
- <pathelement
location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/>
- <pathelement
location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/>
+ <pathelement
location="${int.metro.dir}/output/lib/jbossws-sunri-client.jar"/>
+ <pathelement
location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/>
</path>
<taskdef name="wsimport"
classname="com.sun.tools.ws.ant.WsImport">
@@ -104,8 +104,8 @@
<target name="tests-compile" depends="wsimport,tests-classpath"
description="Compile sources">
<macro-compile-classes srcdir="${tests.output.dir}/wsimport"
excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${sunri.dir}/src/test-framework/java"
excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${sunri.dir}/src/test/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}"/>
</target>
<!-- ================================================================== -->
@@ -114,13 +114,13 @@
<!-- Copy resources -->
<target name="tests-copy-resources" depends="tests-init"
description="Copy the deployment resources.">
- <macro-copy-resources srcdir="${sunri.dir}/src/test-framework"/>
- <macro-copy-resources srcdir="${sunri.dir}/src/test"/>
+ <macro-copy-resources srcdir="${metro.dir}/src/test-framework"/>
+ <macro-copy-resources srcdir="${metro.dir}/src/test"/>
</target>
<target name="tests-jars"
depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources"
description="Build the deployments.">
- <ant antfile="${sunri.dir}/ant-import-tests/build-jars-jaxws.xml"
target="build-jars-jaxws"/>
- <ant
antfile="${int.sunri.dir}/src/test-framework/ant-import/build-jars-jaxws.xml"
target="build-jars-jaxws"/>
+ <ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml"
target="build-jars-jaxws"/>
+ <ant
antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml"
target="build-jars-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-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/build.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -13,7 +13,7 @@
<project default="main" basedir="."
name="JBossWS-SunRI">
- <property name="int.sunri.dir" value="${basedir}"/>
+ <property name="int.metro.dir" value="${basedir}"/>
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-bin-dist.xml"/>
@@ -25,17 +25,17 @@
<!-- Setup -->
<!-- ================================================================== -->
- <property name="sunri.dir" value="${int.sunri.dir}"/>
- <property name="sunri.src.dir"
value="${sunri.dir}/src/main"/>
- <property name="sunri.distro.dir"
value="${sunri.src.dir}/distro"/>
- <property name="sunri.etc.dir"
value="${sunri.src.dir}/etc"/>
- <property name="sunri.java.dir"
value="${sunri.src.dir}/java"/>
- <property name="sunri.resources.dir"
value="${sunri.src.dir}/resources"/>
- <property name="sunri.output.dir"
value="${sunri.dir}/output"/>
- <property name="sunri.output.apidocs.dir"
value="${sunri.output.dir}/apidocs"/>
- <property name="sunri.output.classes.dir"
value="${sunri.output.dir}/classes"/>
- <property name="sunri.output.etc.dir"
value="${sunri.output.dir}/etc"/>
- <property name="sunri.output.lib.dir"
value="${sunri.output.dir}/lib"/>
+ <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.etc.dir"
value="${metro.output.dir}/etc"/>
+ <property name="metro.output.lib.dir"
value="${metro.output.dir}/lib"/>
<import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
@@ -46,7 +46,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <mkdir dir="${sunri.output.apidocs.dir}"/>
+ <mkdir dir="${metro.output.apidocs.dir}"/>
</target>
<!-- ================================================================== -->
@@ -66,19 +66,19 @@
<!-- Compile java sources -->
<target name="compile-classes"
depends="compile-classes-sunri"/>
<target name="compile-classes-sunri" depends="init">
- <mkdir dir="${sunri.output.classes.dir}"/>
- <javac srcdir="${sunri.java.dir}" sourcepath=""
destdir="${sunri.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
+ <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}"
deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
<include name="org/jboss/wsf/stack/sunri/**"/>
- <classpath refid="sunri.integration.classpath"/>
+ <classpath refid="metro.integration.classpath"/>
</javac>
</target>
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
- <mkdir dir="${sunri.output.etc.dir}"/>
- <copy todir="${sunri.output.etc.dir}" filtering="yes"
overwrite="true">
- <fileset dir="${sunri.etc.dir}">
+ <mkdir dir="${metro.output.etc.dir}"/>
+ <copy todir="${metro.output.etc.dir}" filtering="yes"
overwrite="true">
+ <fileset dir="${metro.etc.dir}">
<include name="component-info.xml"/>
<include name="default.mf"/>
</fileset>
@@ -87,7 +87,7 @@
<filter token="java.vm.vendor"
value="${java.vm.vendor}"/>
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version"
value="${specification.version}-metro-${version.id}"/>
- <filtersfile file="${int.sunri.dir}/version.properties"/>
+ <filtersfile file="${int.metro.dir}/version.properties"/>
</filterset>
</copy>
</target>
@@ -105,9 +105,9 @@
<target name="jars-common" depends="build.metro,compile">
<!-- Build jbossws-sunri.jar -->
- <mkdir dir="${sunri.output.lib.dir}"/>
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar"
manifest="${sunri.output.etc.dir}/default.mf">
- <fileset dir="${sunri.output.classes.dir}">
+ <mkdir dir="${metro.output.lib.dir}"/>
+ <jar jarfile="${metro.output.lib.dir}/jbossws-sunri.jar"
manifest="${metro.output.etc.dir}/default.mf">
+ <fileset dir="${metro.output.classes.dir}">
<exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/>
<include name="org/jboss/wsf/stack/sunri/injection/**"/>
<include name="org/jboss/wsf/stack/sunri/client/**"/>
@@ -115,21 +115,21 @@
<include name="org/jboss/wsf/stack/sunri/log/**"/>
<include name="org/jboss/wsf/stack/sunri/*"/>
</fileset>
- <metainf
dir="${sunri.resources.dir}/jbossws-sunri.jar/META-INF"/>
+ <metainf
dir="${metro.resources.dir}/jbossws-sunri.jar/META-INF"/>
</jar>
<!-- jbossws-sunri-client.jar -->
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri-client.jar"
manifest="${sunri.output.etc.dir}/default.mf">
- <fileset dir="${sunri.output.classes.dir}">
+ <jar jarfile="${metro.output.lib.dir}/jbossws-sunri-client.jar"
manifest="${metro.output.etc.dir}/default.mf">
+ <fileset dir="${metro.output.classes.dir}">
<include name="org/jboss/wsf/stack/sunri/client/**"/>
<include name="org/jboss/wsf/stack/sunri/tools/**"/>
</fileset>
- <metainf
dir="${sunri.resources.dir}/jbossws-sunri-client.jar/META-INF"/>
+ <metainf
dir="${metro.resources.dir}/jbossws-sunri-client.jar/META-INF"/>
</jar>
<!-- Build jbossws-context.war -->
- <copy todir="${sunri.output.lib.dir}/jbossws-context.war"
filtering="true">
- <fileset dir="${sunri.resources.dir}/jbossws-context.war">
+ <copy todir="${metro.output.lib.dir}/jbossws-context.war"
filtering="true">
+ <fileset dir="${metro.resources.dir}/jbossws-context.war">
<include name="index.html"/>
<include name="styles.css"/>
<include name="WEB-INF/**"/>
@@ -137,33 +137,33 @@
<filterset>
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version"
value="${specification.version}-metro-${version.id}"/>
- <filtersfile file="${sunri.dir}/version.properties"/>
+ <filtersfile file="${metro.dir}/version.properties"/>
</filterset>
</copy>
<!-- Build jbossws-sunri-src.zip -->
- <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri-src.zip" >
- <fileset dir="${sunri.java.dir}"/>
+ <zip zipfile="${metro.output.lib.dir}/jbossws-sunri-src.zip" >
+ <fileset dir="${metro.java.dir}"/>
</zip>
</target>
<target name="jars-jboss50" depends="jars-common">
<!-- Concat jbossws-beans.xml -->
- <concat
destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml">
+ <concat
destfile="${metro.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0">
</header>
- <fileset
file="${sunri.resources.dir}/jbossws-sunri-config.xml"/>
+ <fileset
file="${metro.resources.dir}/jbossws-sunri-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
</concat>
<!-- Build jbossws-sunri50.sar -->
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar"
manifest="${sunri.output.etc.dir}/default.mf">
+ <jar jarfile="${metro.output.lib.dir}/jbossws-sunri50.sar"
manifest="${metro.output.etc.dir}/default.mf">
- <fileset dir="${sunri.output.lib.dir}">
+ <fileset dir="${metro.output.lib.dir}">
<include name="jbossws-context.war/**"/>
<include name="jbossws-context.war"/>
</fileset>
@@ -192,10 +192,10 @@
<include name="*.jar"/>
</fileset>
- <fileset dir="${sunri.output.lib.dir}">
+ <fileset dir="${metro.output.lib.dir}">
<include name="jbossws-sunri.jar"/>
</fileset>
- <metainf dir="${sunri.output.lib.dir}/jbossws-sunri50">
+ <metainf dir="${metro.output.lib.dir}/jbossws-sunri50">
<include name="jbossws-beans.xml"/>
</metainf>
</jar>
@@ -203,27 +203,27 @@
<target name="jars-jboss422" depends="jars-common"
if="jboss422.home">
- <unzip dest="${sunri.output.dir}/resources"
src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+ <unzip dest="${metro.output.dir}/resources"
src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
<!-- Concat jboss-beans.xml -->
- <concat
destfile="${sunri.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml">
+ <concat
destfile="${metro.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<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">
</header>
- <fileset
file="${sunri.resources.dir}/jbossws-sunri-config.xml"/>
- <fileset
file="${sunri.output.dir}/resources/jbossws-jboss42-config.xml"/>
+ <fileset
file="${metro.resources.dir}/jbossws-sunri-config.xml"/>
+ <fileset
file="${metro.output.dir}/resources/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
</concat>
<!-- Build jbossws-sunri42.sar -->
- <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar"
manifest="${sunri.output.etc.dir}/default.mf">
- <fileset dir="${sunri.output.lib.dir}">
+ <jar jarfile="${metro.output.lib.dir}/jbossws-sunri42.sar"
manifest="${metro.output.etc.dir}/default.mf">
+ <fileset dir="${metro.output.lib.dir}">
<include name="jbossws-context.war/**"/>
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${sunri.output.lib.dir}">
+ <fileset dir="${metro.output.lib.dir}">
<include name="jbossws-sunri.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -254,10 +254,10 @@
</fileset>
- <fileset dir="${sunri.output.lib.dir}/jbossws-sunri42">
+ <fileset dir="${metro.output.lib.dir}/jbossws-sunri42">
<include name="jbossws.beans/**"/>
</fileset>
- <metainf
dir="${sunri.output.dir}/resources/jbossws-jboss42.sar/META-INF">
+ <metainf
dir="${metro.output.dir}/resources/jbossws-jboss42.sar/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
@@ -274,19 +274,19 @@
<target name="javadoc" depends="init"
description="Generate the Javadoc" if="javadoc">
<!-- expand the sunri sources -->
- <mkdir dir="${sunri.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/jaxws-ri-src.jar"
dest="${sunri.output.dir}/thirdparty-sources"/>
+ <mkdir dir="${metro.output.dir}/thirdparty-sources"/>
+ <unzip src="${thirdparty.dir}/jaxws-ri-src.jar"
dest="${metro.output.dir}/thirdparty-sources"/>
- <javadoc destdir="${sunri.output.apidocs.dir}" author="true"
version="true" use="true" windowtitle="JBossWS API">
+ <javadoc destdir="${metro.output.apidocs.dir}" author="true"
version="true" use="true" windowtitle="JBossWS API">
<classpath>
- <pathelement path="${sunri50.integration.classpath}"/>
- <pathelement path="${sunri.integration.classpath}"/>
+ <pathelement path="${metro50.integration.classpath}"/>
+ <pathelement path="${metro.integration.classpath}"/>
</classpath>
- <packageset dir="${sunri.java.dir}"
defaultexcludes="yes">
+ <packageset dir="${metro.java.dir}"
defaultexcludes="yes">
<include name="org/jboss/wsf/**"/>
</packageset>
- <packageset dir="${sunri.output.dir}/thirdparty-sources"
defaultexcludes="yes">
+ <packageset dir="${metro.output.dir}/thirdparty-sources"
defaultexcludes="yes">
<include name="com/sun/**"/>
</packageset>
@@ -305,12 +305,12 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans
up most generated files.">
- <delete dir="${sunri.output.dir}"/>
+ <delete dir="${metro.output.dir}"/>
<delete dir="thirdparty.gen"/>
</target>
<target name="clobber" depends="clean" description="Cleans
up all generated files.">
- <delete dir="${int.sunri.dir}/thirdparty"/>
+ <delete dir="${int.metro.dir}/thirdparty"/>
</target>
<target name="main" description="Executes the default target
(most)." depends="most"/>
Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 18:24:48 UTC (rev
5686)
+++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-15 09:24:49 UTC (rev
5687)
@@ -87,7 +87,7 @@
<import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/macros-deploy-framework.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-metro.xml"/>
<import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 18:24:48 UTC (rev
5686)
+++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-15 09:24:49 UTC (rev
5687)
@@ -17,18 +17,18 @@
<!-- Deployment JBoss-4.2.2 -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/sunri to jboss422 -->
- <target name="deploy-jboss422"
depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy
jbossws/sunri to jboss422">
- <macro-deploy-sunri422 stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
+ <!-- Deploy jbossws/metro to jboss422 -->
+ <target name="deploy-jboss422"
depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy
jbossws/metro to jboss422">
+ <macro-deploy-metro422 stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework thirdpartylibs="${lib.dir}"
jbosshome="${jboss422.home}"/>
</target>
<target name="deploy-jboss422-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
<macro-deploy-endorsed jbosshome="${jboss422.home}"
thirdpartylibs="${lib.dir}"/>
</target>
- <!-- Remove jbossws/sunri from jboss422 -->
- <target name="undeploy-jboss422"
depends="prepare,undeploy-jboss422-endorsed" description="Remove
jbossws/sunri from jboss422">
- <macro-undeploy-sunri422/>
+ <!-- Remove jbossws/metro from jboss422 -->
+ <target name="undeploy-jboss422"
depends="prepare,undeploy-jboss422-endorsed" description="Remove
jbossws/metro from jboss422">
+ <macro-undeploy-metro422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
<target name="undeploy-jboss422-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
@@ -39,18 +39,18 @@
<!-- Deployment JBoss-4.2.3 -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/sunri to jboss423 -->
- <target name="deploy-jboss423"
depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy
jbossws/sunri to jboss423">
- <macro-deploy-sunri423 stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
+ <!-- Deploy jbossws/metro to jboss423 -->
+ <target name="deploy-jboss423"
depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy
jbossws/metro to jboss423">
+ <macro-deploy-metro423 stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework thirdpartylibs="${lib.dir}"
jbosshome="${jboss423.home}"/>
</target>
<target name="deploy-jboss423-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
<macro-deploy-endorsed jbosshome="${jboss423.home}"
thirdpartylibs="${lib.dir}"/>
</target>
- <!-- Remove jbossws/sunri from jboss423 -->
- <target name="undeploy-jboss423"
depends="prepare,undeploy-jboss423-endorsed" description="Remove
jbossws/sunri from jboss423">
- <macro-undeploy-sunri423/>
+ <!-- Remove jbossws/metro from jboss423 -->
+ <target name="undeploy-jboss423"
depends="prepare,undeploy-jboss423-endorsed" description="Remove
jbossws/metro from jboss423">
+ <macro-undeploy-metro423/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
<target name="undeploy-jboss423-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
@@ -61,18 +61,18 @@
<!-- Deployment JBoss-5.0.0 -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/sunri to jboss500 -->
- <target name="deploy-jboss500"
depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy
jbossws/sunri to jboss500">
- <macro-deploy-sunri500 stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
+ <!-- Deploy jbossws/metro to jboss500 -->
+ <target name="deploy-jboss500"
depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy
jbossws/metro to jboss500">
+ <macro-deploy-metro500 stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework thirdpartylibs="${lib.dir}"
jbosshome="${jboss500.home}"/>
</target>
<target name="deploy-jboss500-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
<macro-deploy-endorsed jbosshome="${jboss500.home}"
thirdpartylibs="${lib.dir}"/>
</target>
- <!-- Remove jbossws/sunri from jboss500 -->
- <target name="undeploy-jboss500" depends="prepare"
description="Remove jbossws/sunri from jboss500">
- <macro-undeploy-sunri500/>
+ <!-- Remove jbossws/metro from jboss500 -->
+ <target name="undeploy-jboss500" depends="prepare"
description="Remove jbossws/metro from jboss500">
+ <macro-undeploy-metro500/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
@@ -80,18 +80,18 @@
<!-- Deployment JBoss-5.0.1 -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/sunri to jboss501 -->
- <target name="deploy-jboss501"
depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy
jbossws/sunri to jboss501">
- <macro-deploy-sunri501 stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
+ <!-- Deploy jbossws/metro to jboss501 -->
+ <target name="deploy-jboss501"
depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy
jbossws/metro to jboss501">
+ <macro-deploy-metro501 stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework thirdpartylibs="${lib.dir}"
jbosshome="${jboss501.home}"/>
</target>
<target name="deploy-jboss501-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
<macro-deploy-endorsed jbosshome="${jboss501.home}"
thirdpartylibs="${lib.dir}"/>
</target>
- <!-- Remove jbossws/sunri from jboss501 -->
- <target name="undeploy-jboss501" depends="prepare"
description="Remove jbossws/sunri from jboss501">
- <macro-undeploy-sunri501/>
+ <!-- Remove jbossws/metro from jboss501 -->
+ <target name="undeploy-jboss501" depends="prepare"
description="Remove jbossws/metro from jboss501">
+ <macro-undeploy-metro501/>
<macro-undeploy-framework jbosshome="${jboss501.home}"/>
</target>
Modified: stack/metro/trunk/src/main/etc/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/etc/bin-dist-build.xml 2008-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/src/main/etc/bin-dist-build.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -70,7 +70,7 @@
<import file="${basedir}/build/build-testsuite.xml"/>
<import file="${basedir}/build/macros-deploy-spi.xml"/>
<import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-metro.xml"/>
<import file="${basedir}/build/macros-deploy-xfire.xml"/>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/etc/bin-dist-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2008-02-14 18:24:48 UTC (rev 5686)
+++ stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2008-02-15 09:24:49 UTC (rev 5687)
@@ -17,11 +17,11 @@
<!-- Deployment JBoss-4.2.2 -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/sunri to jboss422 -->
- <target name="deploy-jboss422" depends="undeploy-jboss422"
description="Deploy jbossws/sunri to jboss422">
+ <!-- Deploy jbossws/metro to jboss422 -->
+ <target name="deploy-jboss422" depends="undeploy-jboss422"
description="Deploy jbossws/metro to jboss422">
<macro-undeploy-native422/>
<macro-undeploy-xfire422/>
- <macro-deploy-sunri422
+ <macro-deploy-metro422
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
@@ -33,9 +33,9 @@
jbosshome="${jboss422.home}"/>
</target>
- <!-- Remove jbossws/sunri from jboss42 -->
- <target name="undeploy-jboss422" depends="prepare"
description="Remove jbossws/sunri from jboss422">
- <macro-undeploy-sunri422/>
+ <!-- Remove jbossws/metro from jboss42 -->
+ <target name="undeploy-jboss422" depends="prepare"
description="Remove jbossws/metro from jboss422">
+ <macro-undeploy-metro422/>
<macro-undeploy-spi jbosshome="${jboss422.home}"/>
</target>
@@ -43,11 +43,11 @@
<!-- Deployment JBoss-5.0.0 -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/sunri to jboss500 -->
- <target name="deploy-jboss500" depends="undeploy-jboss500"
description="Deploy jbossws/sunri to jboss500">
+ <!-- Deploy jbossws/metro to jboss500 -->
+ <target name="deploy-jboss500" depends="undeploy-jboss500"
description="Deploy jbossws/metro to jboss500">
<macro-undeploy-native500/>
<macro-undeploy-xfire500/>
- <macro-deploy-sunri500
+ <macro-deploy-metro500
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
@@ -59,9 +59,9 @@
jbosshome="${jboss500.home}"/>
</target>
- <!-- Remove jbossws/sunri from jboss500 -->
- <target name="undeploy-jboss500" depends="prepare"
description="Remove jbossws/sunri from jboss500">
- <macro-undeploy-sunri500/>
+ <!-- Remove jbossws/metro from jboss500 -->
+ <target name="undeploy-jboss500" depends="prepare"
description="Remove jbossws/metro from jboss500">
+ <macro-undeploy-metro500/>
<macro-undeploy-spi jbosshome="${jboss500.home}"/>
</target>
@@ -69,11 +69,11 @@
<!-- Deployment JBoss-5.0.1 -->
<!-- ================================================================== -->
- <!-- Deploy jbossws/sunri to jboss501 -->
- <target name="deploy-jboss501" depends="undeploy-jboss501"
description="Deploy jbossws/sunri to jboss501">
+ <!-- Deploy jbossws/metro to jboss501 -->
+ <target name="deploy-jboss501" depends="undeploy-jboss501"
description="Deploy jbossws/metro to jboss501">
<macro-undeploy-native501/>
<macro-undeploy-xfire501/>
- <macro-deploy-sunri501
+ <macro-deploy-metro501
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
@@ -85,9 +85,9 @@
jbosshome="${jboss501.home}"/>
</target>
- <!-- Remove jbossws/sunri from jboss501 -->
- <target name="undeploy-jboss501" depends="prepare"
description="Remove jbossws/sunri from jboss501">
- <macro-undeploy-sunri501/>
+ <!-- Remove jbossws/metro from jboss501 -->
+ <target name="undeploy-jboss501" depends="prepare"
description="Remove jbossws/metro from jboss501">
+ <macro-undeploy-metro501/>
<macro-undeploy-spi jbosshome="${jboss501.home}"/>
</target>