JBossWS SVN: r5593 - stack/native/branches/jbossws-native-2.0.3.QA/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 10:36:11 -0500 (Wed, 06 Feb 2008)
New Revision: 5593
Modified:
stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-deploy.xml
Log:
[JBWS-1982] fix
Modified: stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-deploy.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-deploy.xml 2008-02-06 15:31:27 UTC (rev 5592)
+++ stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-deploy.xml 2008-02-06 15:36:11 UTC (rev 5593)
@@ -14,6 +14,8 @@
<project>
<import file="${core.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
+ <import file="${core.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/>
+ <import file="${core.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/>
<import file="${core.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
<!-- Deploy jbossws to jboss405 -->
@@ -68,6 +70,8 @@
<!-- Remove jbossws from jboss422 -->
<target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-undeploy-cxf422/>
+ <macro-undeploy-sunri422/>
<macro-undeploy-native422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
@@ -89,6 +93,8 @@
<!-- Remove jbossws from jboss423 -->
<target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <macro-undeploy-cxf423/>
+ <macro-undeploy-sunri423/>
<macro-undeploy-native423/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
@@ -108,6 +114,8 @@
<!-- Remove jbossws from jboss500 -->
<target name="undeploy-jboss500" depends="prepare,undeploy-jboss500-endorsed" description="Remove jbossws from jboss500">
+ <macro-undeploy-cxf500/>
+ <macro-undeploy-sunri500/>
<macro-undeploy-native500/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
16 years, 11 months
JBossWS SVN: r5592 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 10:31:27 -0500 (Wed, 06 Feb 2008)
New Revision: 5592
Modified:
stack/native/trunk/ant-import/build-deploy.xml
Log:
[JBWS-1982] fix
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-02-06 15:30:28 UTC (rev 5591)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-06 15:31:27 UTC (rev 5592)
@@ -14,6 +14,8 @@
<project>
<import file="${core.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
+ <import file="${core.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/>
+ <import file="${core.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/>
<import file="${core.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
<!-- Deploy jbossws to jboss405 -->
@@ -68,6 +70,8 @@
<!-- Remove jbossws from jboss422 -->
<target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-undeploy-cxf422/>
+ <macro-undeploy-sunri422/>
<macro-undeploy-native422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
@@ -89,6 +93,8 @@
<!-- Remove jbossws from jboss423 -->
<target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <macro-undeploy-cxf423/>
+ <macro-undeploy-sunri423/>
<macro-undeploy-native423/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
@@ -108,6 +114,8 @@
<!-- Remove jbossws from jboss500 -->
<target name="undeploy-jboss500" depends="prepare,undeploy-jboss500-endorsed" description="Remove jbossws from jboss500">
+ <macro-undeploy-cxf500/>
+ <macro-undeploy-sunri500/>
<macro-undeploy-native500/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
16 years, 11 months
JBossWS SVN: r5591 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 10:30:28 -0500 (Wed, 06 Feb 2008)
New Revision: 5591
Modified:
stack/metro/trunk/ant-import/build-deploy.xml
Log:
[JBWS-1982] fix
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2008-02-06 15:29:22 UTC (rev 5590)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-06 15:30:28 UTC (rev 5591)
@@ -14,10 +14,12 @@
<project>
<import file="${int.sunri.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
+ <import file="${int.sunri.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/>
<import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/>
+ <import file="${int.sunri.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
<!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
+ <!-- Deployment JBoss422 -->
<!-- ================================================================== -->
<target name="deploy-jboss422" depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
@@ -31,12 +33,15 @@
</target>
<target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-cxf422/>
<macro-undeploy-sunri422/>
+ <macro-undeploy-native422/>
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
+ <!-- Deployment JBoss423 -->
<!-- ================================================================== -->
<target name="deploy-jboss423" depends="jars-jboss423, undeploy-jboss423" description="Deploy jbossws/sunri to jboss42">
@@ -50,12 +55,15 @@
</target>
<target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-cxf423/>
<macro-undeploy-sunri423/>
+ <macro-undeploy-native423/>
+ <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
+ <!-- Deployment JBoss500 -->
<!-- ================================================================== -->
<target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50">
@@ -69,7 +77,10 @@
</target>
<target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-cxf500/>
<macro-undeploy-sunri500/>
+ <macro-undeploy-native500/>
+ <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
16 years, 11 months
JBossWS SVN: r5590 - stack/cxf/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 10:29:22 -0500 (Wed, 06 Feb 2008)
New Revision: 5590
Modified:
stack/cxf/trunk/ant-import/build-deploy.xml
Log:
[JBWS-1982] fix
Modified: stack/cxf/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-06 14:43:38 UTC (rev 5589)
+++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-06 15:29:22 UTC (rev 5590)
@@ -15,6 +15,8 @@
<import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
<import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/>
+ <import file="${int.cxf.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/>
+ <import file="${int.cxf.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
<!-- ================================================================== -->
<!-- Deployment JBoss422 -->
@@ -32,6 +34,9 @@
<target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422">
<macro-undeploy-cxf422/>
+ <macro-undeploy-sunri422/>
+ <macro-undeploy-native422/>
+ <macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
@@ -51,6 +56,9 @@
<target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423">
<macro-undeploy-cxf423/>
+ <macro-undeploy-sunri423/>
+ <macro-undeploy-native423/>
+ <macro-undeploy-endorsed jbosshome="${jboss423.home}"/>
<macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
@@ -70,6 +78,9 @@
<target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500">
<macro-undeploy-cxf500/>
+ <macro-undeploy-sunri500/>
+ <macro-undeploy-native500/>
+ <macro-undeploy-endorsed jbosshome="${jboss500.home}"/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
16 years, 11 months
JBossWS SVN: r5589 - stack/cxf/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 09:43:38 -0500 (Wed, 06 Feb 2008)
New Revision: 5589
Modified:
stack/cxf/trunk/ant-import/
Log:
[JBWS-1982] defining SVN ignores
Property changes on: stack/cxf/trunk/ant-import
___________________________________________________________________
Name: svn:ignore
+ macros-deploy-native.xml
macros-deploy-framework.xml
macros-deploy-sunri.xml
macros-deploy-cxf.xml
16 years, 11 months
JBossWS SVN: r5588 - stack/cxf/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 09:41:15 -0500 (Wed, 06 Feb 2008)
New Revision: 5588
Modified:
stack/cxf/trunk/ant-import/build-deploy.xml
Log:
[JBWS-1982] macros are optional
Modified: stack/cxf/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-06 14:40:40 UTC (rev 5587)
+++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-06 14:41:15 UTC (rev 5588)
@@ -13,8 +13,8 @@
<project>
- <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml"/>
- <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/>
+ <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
+ <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/>
<!-- ================================================================== -->
<!-- Deployment JBoss422 -->
16 years, 11 months
JBossWS SVN: r5587 - in stack/cxf/trunk: ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 09:40:40 -0500 (Wed, 06 Feb 2008)
New Revision: 5587
Removed:
stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
stack/cxf/trunk/ant-import/macros-deploy-framework.xml
Modified:
stack/cxf/trunk/ant-import/build-thirdparty.xml
stack/cxf/trunk/version.properties
Log:
[JBWS-1982] use macros from binary repository
Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-02-06 14:35:23 UTC (rev 5586)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-02-06 14:40:40 UTC (rev 5587)
@@ -47,6 +47,7 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
+ <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-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" 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"/>
@@ -72,7 +73,7 @@
<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-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.cxf.dir}/version.properties" fileext=".md5"/>
</target>
Deleted: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-06 14:35:23 UTC (rev 5586)
+++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-06 14:40:40 UTC (rev 5587)
@@ -1,202 +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.patternset">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.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="saaj-api-*.jar"/>
- </patternset>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/cxf to jboss422 -->
- <macrodef name="macro-deploy-cxf422">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss422.home}/client" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss422.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
-
- <!--SERVER JARS -->
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.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>
-
- <!-- Undeploy jbossws/cxf from jboss422 -->
- <macrodef name="macro-undeploy-cxf422">
- <sequential>
- <delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss422.home}/client">
- <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-cxf.sar"/>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/cxf to jboss423 -->
- <macrodef name="macro-deploy-cxf423">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss423.home}/client" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss423.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
-
- <!--SERVER JARS -->
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/>
- <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf42.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>
-
- <!-- Undeploy jbossws/cxf from jboss423 -->
- <macrodef name="macro-undeploy-cxf423">
- <sequential>
- <delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss423.home}/client">
- <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-cxf.sar"/>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/cxf to jboss500 -->
- <macrodef name="macro-deploy-cxf500">
- <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="@{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-cxf.sar"/>
- <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src="@{stacklibs}/jbossws-cxf50.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>
-
- <!-- Undeploy jbossws/cxf from jboss500 -->
- <macrodef name="macro-undeploy-cxf500">
- <sequential>
- <delete>
- <!-- CLIENT JARS -->
- <fileset dir="${jboss500.home}/client">
- <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-cxf.sar"/>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
-</project>
Deleted: stack/cxf/trunk/ant-import/macros-deploy-framework.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-06 14:35:23 UTC (rev 5586)
+++ stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-06 14:40:40 UTC (rev 5587)
@@ -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(a)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>
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2008-02-06 14:35:23 UTC (rev 5586)
+++ stack/cxf/trunk/version.properties 2008-02-06 14:40:40 UTC (rev 5587)
@@ -37,6 +37,7 @@
jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
+jbossws-macros=1.0.0.GA
jbossws-jboss42=4.2.1.GA
apache-xml-commons=1.2
16 years, 11 months
JBossWS SVN: r5586 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 09:35:23 -0500 (Wed, 06 Feb 2008)
New Revision: 5586
Modified:
stack/metro/trunk/ant-import/
Log:
[JBWS-1982] defining SVN ignores
Property changes on: stack/metro/trunk/ant-import
___________________________________________________________________
Name: svn:ignore
+ macros-deploy-native.xml
macros-deploy-framework.xml
macros-deploy-sunri.xml
macros-deploy-cxf.xml
16 years, 11 months
JBossWS SVN: r5585 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 09:32:22 -0500 (Wed, 06 Feb 2008)
New Revision: 5585
Modified:
stack/metro/trunk/ant-import/build-deploy.xml
Log:
[JBWS-1982] macros are optional
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2008-02-06 14:31:19 UTC (rev 5584)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-06 14:32:22 UTC (rev 5585)
@@ -13,8 +13,8 @@
<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.sunri.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
+ <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/>
<!-- ================================================================== -->
<!-- Deployment JBoss422 -->
16 years, 11 months
JBossWS SVN: r5584 - in stack/metro/trunk: ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)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(a)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
16 years, 11 months