[jbossws-commits] JBossWS SVN: r5584 - in stack/metro/trunk: ant-import and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Feb 6 09:31:19 EST 2008
Author: richard.opalka at jboss.com
Date: 2008-02-06 09:31:19 -0500 (Wed, 06 Feb 2008)
New Revision: 5584
Removed:
stack/metro/trunk/ant-import/macros-deploy-framework.xml
stack/metro/trunk/ant-import/macros-deploy-sunri.xml
Modified:
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/version.properties
Log:
[JBWS-1982] use macros from binary repository
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-02-06 14:18:32 UTC (rev 5583)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-02-06 14:31:19 UTC (rev 5584)
@@ -45,6 +45,7 @@
<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-macros/${jbossws-macros}/lib/jbossws-macros-src.zip" dest="${thirdparty.dir}/jbossws-macros-src.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"/>
@@ -78,6 +79,7 @@
<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"/>
+ <unzip dest="${basedir}/ant-import" src="${thirdparty.dir}/jbossws-macros-src.zip"/>
<checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/>
</target>
Deleted: stack/metro/trunk/ant-import/macros-deploy-framework.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-06 14:18:32 UTC (rev 5583)
+++ stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-06 14:31:19 UTC (rev 5584)
@@ -1,72 +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: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun at jboss.com $ -->
-
-<project>
-
- <macrodef name="macro-deploy-framework">
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>
- <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS-->
- <copy todir="@{jbosshome}/client">
- <fileset dir="@{thirdpartylibs}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS-->
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <fileset dir="@{thirdpartylibs}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-framework">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
- <!-- CLIENT JARS-->
- <fileset dir="@{jbosshome}/client">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
-
- <!-- SERVER JARS-->
- <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
-
-</project>
Deleted: stack/metro/trunk/ant-import/macros-deploy-sunri.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-06 14:18:32 UTC (rev 5583)
+++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-06 14:31:19 UTC (rev 5584)
@@ -1,213 +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"/>
- <include name="jboss-wsit-tools.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="@{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="@{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="@{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="@{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="@{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="@{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>
-
-</project>
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-02-06 14:18:32 UTC (rev 5583)
+++ stack/metro/trunk/version.properties 2008-02-06 14:31:19 UTC (rev 5584)
@@ -16,6 +16,7 @@
# Thirdparty library versions
jbossws-spi=1.0.1.GA
jbossws-common=1.0.3.GA
+jbossws-macros=1.0.0.GA
jbossws-framework=2.0.3.GA
jbossws-jboss42=4.2.1.GA
More information about the jbossws-commits
mailing list