JBossWS SVN: r5583 - 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 09:18:32 -0500 (Wed, 06 Feb 2008)
New Revision: 5583
Modified:
stack/native/branches/jbossws-native-2.0.3.QA/ant-import/
Log:
[JBWS-1982] defining SVN ignores
Property changes on: stack/native/branches/jbossws-native-2.0.3.QA/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: r5582 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 09:13:27 -0500 (Wed, 06 Feb 2008)
New Revision: 5582
Modified:
stack/native/trunk/ant-import/
Log:
[JBWS-1982] defining SVN ignores
Property changes on: stack/native/trunk/ant-import
___________________________________________________________________
Name: svn:ignore
+ macros-deploy-cxf.xml
macros-deploy-framework.xml
macros-deploy-native.xml
macros-deploy-sunri.xml
16 years, 11 months
JBossWS SVN: r5581 - 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 09:04:42 -0500 (Wed, 06 Feb 2008)
New Revision: 5581
Modified:
stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-deploy.xml
Log:
[JBWS-1982] macros are optional
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 14:03:23 UTC (rev 5580)
+++ stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-deploy.xml 2008-02-06 14:04:42 UTC (rev 5581)
@@ -13,8 +13,8 @@
<project>
- <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/>
- <import file="${core.dir}/ant-import/macros-deploy-native.xml"/>
+ <import file="${core.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
+ <import file="${core.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
<!-- Deploy jbossws to jboss405 -->
<target name="deploy-jboss405" depends="deploy-jboss405-ejb3,deploy-jboss405-no-ejb3" description="Deploy jbossws to jboss405"/>
16 years, 11 months
JBossWS SVN: r5580 - in stack/native/branches/jbossws-native-2.0.3.QA: ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 09:03:23 -0500 (Wed, 06 Feb 2008)
New Revision: 5580
Removed:
stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-framework.xml
stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-native.xml
Modified:
stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-thirdparty.xml
stack/native/branches/jbossws-native-2.0.3.QA/version.properties
Log:
[JBWS-1982] use macros from binary repository
Modified: stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-thirdparty.xml 2008-02-06 13:59:44 UTC (rev 5579)
+++ stack/native/branches/jbossws-native-2.0.3.QA/ant-import/build-thirdparty.xml 2008-02-06 14:03:23 UTC (rev 5580)
@@ -51,6 +51,7 @@
<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-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.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-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/>
@@ -123,7 +124,7 @@
<mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
<unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
-
+ <unzip dest="${core.dir}/ant-import" src="${thirdparty.dir}/jbossws-macros-src.zip"/>
<checksum file="${core.dir}/version.properties" fileext=".md5"/>
</target>
@@ -134,9 +135,8 @@
<!-- 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"/>
-
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
Deleted: stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-framework.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-framework.xml 2008-02-06 13:59:44 UTC (rev 5579)
+++ stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-framework.xml 2008-02-06 14:03:23 UTC (rev 5580)
@@ -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/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-native.xml 2008-02-06 13:59:44 UTC (rev 5579)
+++ stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-native.xml 2008-02-06 14:03:23 UTC (rev 5580)
@@ -1,495 +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-native.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
-
-<project>
-
- <patternset id="bin.patternset">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </patternset>
-
- <patternset id="client.stack.patternset">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-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="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </patternset>
-
- <patternset id="bc.patternset">
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jbossws-integration.jar"/>
- </patternset>
-
- <patternset id="lib.patternset">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </patternset>
-
- <patternset id="native.patternset">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- </patternset>
-
- <!-- ================================================================== -->
- <!-- Deploy Endorsed -->
- <!-- ================================================================== -->
-
- <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
- <macrodef name="macro-deploy-endorsed">
- <attribute name="jbosshome"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="@{stacklibs}">
- <patternset refid="native.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- Undeploy API jars from lib/endorsed -->
- <macrodef name="macro-undeploy-endorsed">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <fileset dir="@{jbosshome}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- <patternset refid="native.patternset"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.0.5 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native405">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss405.available.file}" unless="jboss405.available"/>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss405.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss405.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss405.home}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.stack.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- <!-- AS 4.0.5 specific jars -->
- <include name="jbossws-jboss40.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="stax-api.jar"/>
- <include name="wstx.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss405.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <!-- AS 4.0.5 specific jars -->
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss405.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="native.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <!-- AS 4.0.5 specific jars -->
- <include name="jbossws-jboss40.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
- <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
- <mkdir dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
- <mkdir dir="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-native405-no-ejb3">
- <sequential>
-
- <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
- file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
- <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
- file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
-
- <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
- file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
- <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
- file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
-
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native405">
- <sequential>
- <fail message="Not available: ${jboss405.available.file}" unless="jboss405.available"/>
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss405.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss405.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.patternset"/>
- <!-- AS 4.0.5 specific jars -->
- <include name="jbossws14-client.jar"/>
- <include name="jbossws-jboss40.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="stax-api.jar"/>
- <include name="wstx.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss405.home}/lib">
- <patternset refid="bc.patternset"/>
- <!-- AS 4.0.5 specific jars -->
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- <fileset dir="${jboss405.home}/server/${jboss.server.instance}/lib">
- <patternset refid="native.patternset"/>
- <!-- AS 4.0.5 specific jars -->
- <include name="jbossws-jboss40.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <!-- Remove only, do not deploy -->
- <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.1 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native421">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss421.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss421.home}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.stack.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- <!-- AS 4.2.1 specific jars -->
- <include name="jbossws-jboss421.jar"/>
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss421.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <!-- AS 4.2.1 specific jars -->
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss421.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <!-- AS 4.2.1 specific jars -->
- <include name="jbossws-jboss421.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native421">
- <sequential>
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss421.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss421.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.patternset"/>
- <!-- AS 4.2.1 specific jars -->
- <include name="jbossws-jboss421.jar"/>
- <include name="jboss-xml-binding.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss421.home}/lib">
- <patternset refid="bc.patternset"/>
- <!-- AS 4.2.1 specific jars -->
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- <fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib">
- <patternset refid="native.patternset"/>
- <patternset refid="bc.patternset"/>
- <!-- AS 4.2.1 specific jars -->
- <include name="jbossws-jboss421.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.2 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native422">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss422.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <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>
-
- <!-- SERVER JARS -->
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.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>
-
- <macrodef name="macro-undeploy-native422">
- <sequential>
-
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss422.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss422.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss422.home}/lib">
- <patternset refid="bc.patternset"/>
- </fileset>
- <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib">
- <patternset refid="native.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
- </delete>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.3 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native423">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss423.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <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>
-
- <!-- SERVER JARS -->
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.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>
-
- <macrodef name="macro-undeploy-native423">
- <sequential>
-
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss423.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss423.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss423.home}/lib">
- <patternset refid="bc.patternset"/>
- </fileset>
- <fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib">
- <patternset refid="native.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
- </delete>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.0 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native500">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss500.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- 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="@{stacklibs}">
- <patternset refid="native.patternset"/>
- </fileset>
- </copy>
-
- <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.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>
-
- <macrodef name="macro-undeploy-native500">
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
-
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss500.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss500.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.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="native.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
- </delete>
-
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
-</project>
Modified: stack/native/branches/jbossws-native-2.0.3.QA/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.3.QA/version.properties 2008-02-06 13:59:44 UTC (rev 5579)
+++ stack/native/branches/jbossws-native-2.0.3.QA/version.properties 2008-02-06 14:03:23 UTC (rev 5580)
@@ -27,6 +27,7 @@
jbossws-spi=1.0.1.GA
jbossws-common=1.0.3.GA
jbossws-framework=2.0.3.GA
+jbossws-macros=1.0.0.GA
jbossws-jboss40=4.0.5.SP2
jbossws-jboss42=4.2.1.GA
16 years, 11 months
JBossWS SVN: r5579 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 08:59:44 -0500 (Wed, 06 Feb 2008)
New Revision: 5579
Modified:
stack/native/trunk/ant-import/build-deploy.xml
Log:
[JBWS-1982] macros are optional
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-02-06 13:47:45 UTC (rev 5578)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-06 13:59:44 UTC (rev 5579)
@@ -13,8 +13,8 @@
<project>
- <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/>
- <import file="${core.dir}/ant-import/macros-deploy-native.xml"/>
+ <import file="${core.dir}/ant-import/macros-deploy-framework.xml" optional="true"/>
+ <import file="${core.dir}/ant-import/macros-deploy-native.xml" optional="true"/>
<!-- Deploy jbossws to jboss405 -->
<target name="deploy-jboss405" depends="deploy-jboss405-ejb3,deploy-jboss405-no-ejb3" description="Deploy jbossws to jboss405"/>
16 years, 11 months
JBossWS SVN: r5578 - in stack/native/trunk: ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 08:47:45 -0500 (Wed, 06 Feb 2008)
New Revision: 5578
Removed:
stack/native/trunk/ant-import/macros-deploy-framework.xml
stack/native/trunk/ant-import/macros-deploy-native.xml
Modified:
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/version.properties
Log:
[JBWS-1982] use macros from binary repository
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-06 13:21:17 UTC (rev 5577)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-06 13:47:45 UTC (rev 5578)
@@ -51,6 +51,7 @@
<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-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.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-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/>
@@ -123,7 +124,7 @@
<mkdir dir="${thirdparty.dir}/jbpm-bpel"/>
<unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
-
+ <unzip dest="${core.dir}/ant-import" src="${thirdparty.dir}/jbossws-macros-src.zip"/>
<checksum file="${core.dir}/version.properties" fileext=".md5"/>
</target>
@@ -134,9 +135,8 @@
<!-- 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"/>
-
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
Deleted: stack/native/trunk/ant-import/macros-deploy-framework.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-framework.xml 2008-02-06 13:21:17 UTC (rev 5577)
+++ stack/native/trunk/ant-import/macros-deploy-framework.xml 2008-02-06 13:47:45 UTC (rev 5578)
@@ -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/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-06 13:21:17 UTC (rev 5577)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-06 13:47:45 UTC (rev 5578)
@@ -1,495 +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-native.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ -->
-
-<project>
-
- <patternset id="bin.patternset">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
- </patternset>
-
- <patternset id="client.stack.patternset">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-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="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- </patternset>
-
- <patternset id="bc.patternset">
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jbossws-integration.jar"/>
- </patternset>
-
- <patternset id="lib.patternset">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </patternset>
-
- <patternset id="native.patternset">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- </patternset>
-
- <!-- ================================================================== -->
- <!-- Deploy Endorsed -->
- <!-- ================================================================== -->
-
- <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
- <macrodef name="macro-deploy-endorsed">
- <attribute name="jbosshome"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="@{stacklibs}">
- <patternset refid="native.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- Undeploy API jars from lib/endorsed -->
- <macrodef name="macro-undeploy-endorsed">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <fileset dir="@{jbosshome}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- <patternset refid="native.patternset"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.0.5 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native405">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss405.available.file}" unless="jboss405.available"/>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss405.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss405.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss405.home}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.stack.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- <!-- AS 4.0.5 specific jars -->
- <include name="jbossws-jboss40.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="stax-api.jar"/>
- <include name="wstx.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss405.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <!-- AS 4.0.5 specific jars -->
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss405.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="native.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <!-- AS 4.0.5 specific jars -->
- <include name="jbossws-jboss40.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
- <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
- <mkdir dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
- <mkdir dir="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-native405-no-ejb3">
- <sequential>
-
- <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml"
- file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/>
- <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"
- file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>
-
- <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml"
- file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/>
- <move tofile="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"
- file="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/>
-
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native405">
- <sequential>
- <fail message="Not available: ${jboss405.available.file}" unless="jboss405.available"/>
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss405.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss405.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.patternset"/>
- <!-- AS 4.0.5 specific jars -->
- <include name="jbossws14-client.jar"/>
- <include name="jbossws-jboss40.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="stax-api.jar"/>
- <include name="wstx.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss405.home}/lib">
- <patternset refid="bc.patternset"/>
- <!-- AS 4.0.5 specific jars -->
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- <fileset dir="${jboss405.home}/server/${jboss.server.instance}/lib">
- <patternset refid="native.patternset"/>
- <!-- AS 4.0.5 specific jars -->
- <include name="jbossws-jboss40.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <!-- Remove only, do not deploy -->
- <delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.1 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native421">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss421.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <copy todir="${jboss421.home}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.stack.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- <!-- AS 4.2.1 specific jars -->
- <include name="jbossws-jboss421.jar"/>
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${jboss421.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <!-- AS 4.2.1 specific jars -->
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss421.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <!-- AS 4.2.1 specific jars -->
- <include name="jbossws-jboss421.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/>
- <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-native421">
- <sequential>
- <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss421.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss421.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.patternset"/>
- <!-- AS 4.2.1 specific jars -->
- <include name="jbossws-jboss421.jar"/>
- <include name="jboss-xml-binding.jar"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss421.home}/lib">
- <patternset refid="bc.patternset"/>
- <!-- AS 4.2.1 specific jars -->
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- <fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib">
- <patternset refid="native.patternset"/>
- <patternset refid="bc.patternset"/>
- <!-- AS 4.2.1 specific jars -->
- <include name="jbossws-jboss421.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.2 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native422">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss422.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <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>
-
- <!-- SERVER JARS -->
- <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.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>
-
- <macrodef name="macro-undeploy-native422">
- <sequential>
-
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss422.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss422.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss422.home}/lib">
- <patternset refid="bc.patternset"/>
- </fileset>
- <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib">
- <patternset refid="native.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
- </delete>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.3 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native423">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss423.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS -->
- <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>
-
- <!-- SERVER JARS -->
- <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.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>
-
- <macrodef name="macro-undeploy-native423">
- <sequential>
-
- <delete>
-
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss423.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss423.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
-
- <!-- SERVER JARS -->
- <fileset dir="${jboss423.home}/lib">
- <patternset refid="bc.patternset"/>
- </fileset>
- <fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib">
- <patternset refid="native.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
- </delete>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.0 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-native500">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${jboss500.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
- <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
-
- <!-- 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="@{stacklibs}">
- <patternset refid="native.patternset"/>
- </fileset>
- </copy>
-
- <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.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>
-
- <macrodef name="macro-undeploy-native500">
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
-
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="${jboss500.home}/bin">
- <patternset refid="bin.patternset"/>
- </fileset>
-
- <!-- CLIENT JARS -->
- <fileset dir="${jboss500.home}/client">
- <patternset refid="client.stack.patternset"/>
- <patternset refid="client.patternset"/>
- <patternset refid="bc.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="native.patternset"/>
- <patternset refid="bc.patternset"/>
- </fileset>
- </delete>
-
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- </sequential>
- </macrodef>
-
-</project>
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-02-06 13:21:17 UTC (rev 5577)
+++ stack/native/trunk/version.properties 2008-02-06 13:47:45 UTC (rev 5578)
@@ -27,6 +27,7 @@
jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
+jbossws-macros=1.0.0.GA
jbossws-jboss40=4.0.5.SP2
jbossws-jboss42=4.2.1.GA
16 years, 11 months
JBossWS SVN: r5577 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 08:21:17 -0500 (Wed, 06 Feb 2008)
New Revision: 5577
Modified:
stack/metro/trunk/ant-import/macros-deploy-sunri.xml
Log:
[JBWS-1982] fix
Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-06 12:34:58 UTC (rev 5576)
+++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-06 13:21:17 UTC (rev 5577)
@@ -29,6 +29,7 @@
<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">
16 years, 11 months
JBossWS SVN: r5576 - in framework/trunk/hudson/hudson-home/jobs: Metro-Core-AS-4.2.3 and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-06 07:34:58 -0500 (Wed, 06 Feb 2008)
New Revision: 5576
Modified:
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
Log:
Pick up tst reports from correct location
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-06 11:36:06 UTC (rev 5575)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-06 12:34:58 UTC (rev 5576)
@@ -73,7 +73,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/jbossws-metro-@version.id(a)/output/reports/*.xml</testResults>
+ <testResults>stack-metro/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-06 11:36:06 UTC (rev 5575)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-06 12:34:58 UTC (rev 5576)
@@ -73,7 +73,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/jbossws-metro-@version.id(a)/output/reports/*.xml</testResults>
+ <testResults>stack-metro/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-06 11:36:06 UTC (rev 5575)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-06 12:34:58 UTC (rev 5576)
@@ -73,7 +73,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/jbossws-metro-@version.id(a)/output/reports/*.xml</testResults>
+ <testResults>stack-metro/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
16 years, 11 months
JBossWS SVN: r5575 - in framework/trunk/hudson/hudson-home: jobs and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-06 06:36:06 -0500 (Wed, 06 Feb 2008)
New Revision: 5575
Added:
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
Modified:
framework/trunk/hudson/hudson-home/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
Log:
Added metro core test (include wsit features) modules
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2008-02-06 11:28:41 UTC (rev 5574)
+++ framework/trunk/hudson/hudson-home/config.xml 2008-02-06 11:36:06 UTC (rev 5575)
@@ -99,6 +99,9 @@
<jobNames class="tree-set">
<no-comparator/>
<string>Metro-ALL</string>
+ <string>Metro-Core-AS-4.2.2</string>
+ <string>Metro-Core-AS-4.2.3</string>
+ <string>Metro-Core-AS-5.0.0</string>
<string>Metro-Distro-AS-4.2.2</string>
<string>Metro-Distro-AS-4.2.3</string>
<string>Metro-Distro-AS-5.0.0</string>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2008-02-06 11:28:41 UTC (rev 5574)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2008-02-06 11:36:06 UTC (rev 5575)
@@ -4,7 +4,7 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- Metro-Distro-AS-4.2.2, Metro-Distro-AS-4.2.3, Metro-Distro-AS-5.0.0,
+ Metro-Core-AS-4.2.2, Metro-Core-AS-4.2.3, Metro-Core-AS-5.0.0, Metro-Distro-AS-4.2.2, Metro-Distro-AS-4.2.3, Metro-Distro-AS-5.0.0,
Metro-Integration-AS-4.2.2, Metro-Integration-AS-4.2.3, Metro-Integration-AS-5.0.0
</childProjects>
</hudson.tasks.BuildTrigger>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-06 11:36:06 UTC (rev 5575)
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Core-AS-4.2.2
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
+JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+JBOSS_INSTANCE=$JBOSS422_INSTANCE
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss422
+
+#
+# build and deploy
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/output/jbossws-metro-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-4.2.2</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-06 11:36:06 UTC (rev 5575)
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Core-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
+JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss500.home=$JBOSS500_INSTANCE -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss423
+
+#
+# build and deploy
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/output/jbossws-metro-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-4.2.2</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-06 11:36:06 UTC (rev 5575)
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Core-AS-5.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
+JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+JBOSS_INSTANCE=$JBOSS500_INSTANCE
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# undeploy stack-native
+#
+cd $STACKNATIVE
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# undeploy stack-cxf
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT undeploy-jboss500
+
+#
+# build and deploy
+#
+cd $STACKMETRO
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/output/jbossws-metro-@version.id(a)/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-4.2.2</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 11 months
JBossWS SVN: r5574 - 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 06:28:41 -0500 (Wed, 06 Feb 2008)
New Revision: 5574
Modified:
stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-native.xml
Log:
[JBWS-1982] optimization
Modified: stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-native.xml 2008-02-06 11:28:26 UTC (rev 5573)
+++ stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-native.xml 2008-02-06 11:28:41 UTC (rev 5574)
@@ -13,6 +13,50 @@
<project>
+ <patternset id="bin.patternset">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ <include name="wsrunclient.*"/>
+ <include name="wstools.*"/>
+ </patternset>
+
+ <patternset id="client.stack.patternset">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-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="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ </patternset>
+
+ <patternset id="bc.patternset">
+ <include name="jbossws-wsconsume-impl.jar"/>
+ <include name="jbossws-integration.jar"/>
+ </patternset>
+
+ <patternset id="lib.patternset">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </patternset>
+
+ <patternset id="native.patternset">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-jaxws-ext.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </patternset>
+
<!-- ================================================================== -->
<!-- Deploy Endorsed -->
<!-- ================================================================== -->
@@ -28,10 +72,7 @@
<include name="jaxb-api.jar"/>
</fileset>
<fileset dir="@{stacklibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
+ <patternset refid="native.patternset"/>
</fileset>
</copy>
</sequential>
@@ -44,10 +85,7 @@
<delete>
<fileset dir="@{jbosshome}/lib/endorsed">
<include name="jaxb-api.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
+ <patternset refid="native.patternset"/>
</fileset>
</delete>
</sequential>
@@ -70,25 +108,14 @@
<!-- CLIENT JARS -->
<copy todir="${jboss405.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
+ <patternset refid="client.stack.patternset"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <patternset refid="client.patternset"/>
+ <!-- AS 4.0.5 specific jars -->
<include name="jbossws-jboss40.jar"/>
- <include name="policy.jar"/>
- <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="jboss-xml-binding.jar"/>
<include name="stax-api.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
<include name="wstx.jar"/>
</fileset>
</copy>
@@ -96,17 +123,16 @@
<!-- SERVER JARS -->
<copy todir="${jboss405.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
+ <!-- AS 4.0.5 specific jars -->
<include name="jboss-xml-binding.jar"/>
</fileset>
</copy>
<copy todir="${jboss405.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{stacklibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
+ <patternset refid="native.patternset"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <!-- AS 4.0.5 specific jars -->
<include name="jbossws-jboss40.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
@@ -142,46 +168,33 @@
<!-- BIN SCRIPTS -->
<fileset dir="${jboss405.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
+ <patternset refid="bin.patternset"/>
</fileset>
<!-- CLIENT JARS -->
<fileset dir="${jboss405.home}/client">
- <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="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ <patternset refid="bc.patternset"/>
+ <!-- AS 4.0.5 specific jars -->
+ <include name="jbossws14-client.jar"/>
<include name="jbossws-jboss40.jar"/>
- <include name="policy.jar"/>
+ <include name="jboss-xml-binding.jar"/>
<include name="stax-api.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
- <include name="jbossws14-client.jar"/>
+ <include name="wstx.jar"/>
</fileset>
<!-- SERVER JARS -->
<fileset dir="${jboss405.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
+ <patternset refid="bc.patternset"/>
+ <!-- AS 4.0.5 specific jars -->
+ <include name="jboss-xml-binding.jar"/>
</fileset>
<fileset dir="${jboss405.home}/server/${jboss.server.instance}/lib">
+ <patternset refid="native.patternset"/>
+ <!-- AS 4.0.5 specific jars -->
<include name="jbossws-jboss40.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
</delete>
<delete dir="${jboss405.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
@@ -208,35 +221,26 @@
<!-- CLIENT JARS -->
<copy todir="${jboss421.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
+ <patternset refid="client.stack.patternset"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
- <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"/>
+ <patternset refid="client.patternset"/>
+ <!-- AS 4.2.1 specific jars -->
<include name="jbossws-jboss421.jar"/>
<include name="jboss-xml-binding.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
</fileset>
</copy>
<!-- SERVER JARS -->
<copy todir="${jboss421.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
+ <!-- AS 4.2.1 specific jars -->
<include name="jboss-xml-binding.jar"/>
</fileset>
</copy>
<copy todir="${jboss421.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
+ <!-- AS 4.2.1 specific jars -->
<include name="jbossws-jboss421.jar"/>
</fileset>
</copy>
@@ -254,49 +258,30 @@
<!-- BIN SCRIPTS -->
<fileset dir="${jboss421.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
+ <patternset refid="bin.patternset"/>
</fileset>
<!-- CLIENT JARS -->
<fileset dir="${jboss421.home}/client">
- <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="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ <patternset refid="bc.patternset"/>
+ <!-- AS 4.2.1 specific jars -->
<include name="jbossws-jboss421.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
+ <include name="jboss-xml-binding.jar"/>
</fileset>
<!-- SERVER JARS -->
- <fileset dir="${jboss421.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
<fileset dir="${jboss421.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
+ <patternset refid="bc.patternset"/>
+ <!-- AS 4.2.1 specific jars -->
+ <include name="jboss-xml-binding.jar"/>
</fileset>
<fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib">
+ <patternset refid="native.patternset"/>
+ <patternset refid="bc.patternset"/>
+ <!-- AS 4.2.1 specific jars -->
<include name="jbossws-jboss421.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
</fileset>
</delete>
<delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
@@ -320,22 +305,10 @@
<!-- CLIENT JARS -->
<copy todir="${jboss422.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
+ <patternset refid="client.stack.patternset"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
- <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="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
+ <patternset refid="client.patternset"/>
</fileset>
</copy>
@@ -354,47 +327,23 @@
<!-- BIN SCRIPTS -->
<fileset dir="${jboss422.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
+ <patternset refid="bin.patternset"/>
</fileset>
<!-- CLIENT JARS -->
<fileset dir="${jboss422.home}/client">
- <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="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ <patternset refid="bc.patternset"/>
</fileset>
<!-- SERVER JARS -->
- <fileset dir="${jboss422.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
<fileset dir="${jboss422.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
+ <patternset refid="bc.patternset"/>
</fileset>
<fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
+ <patternset refid="native.patternset"/>
+ <patternset refid="bc.patternset"/>
</fileset>
</delete>
<delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
@@ -418,22 +367,10 @@
<!-- CLIENT JARS -->
<copy todir="${jboss423.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
+ <patternset refid="client.stack.patternset"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
- <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="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
+ <patternset refid="client.patternset"/>
</fileset>
</copy>
@@ -452,47 +389,23 @@
<!-- BIN SCRIPTS -->
<fileset dir="${jboss423.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
+ <patternset refid="bin.patternset"/>
</fileset>
<!-- CLIENT JARS -->
<fileset dir="${jboss423.home}/client">
- <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="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ <patternset refid="bc.patternset"/>
</fileset>
<!-- SERVER JARS -->
- <fileset dir="${jboss423.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
<fileset dir="${jboss423.home}/lib">
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
+ <patternset refid="bc.patternset"/>
</fileset>
<fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
+ <patternset refid="native.patternset"/>
+ <patternset refid="bc.patternset"/>
</fileset>
</delete>
<delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
@@ -517,38 +430,24 @@
<!-- CLIENT JARS -->
<copy todir="${jboss500.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
+ <patternset refid="client.stack.patternset"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
- <include name="policy.jar"/>
- <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="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
+ <patternset refid="client.patternset"/>
</fileset>
</copy>
+
+ <!-- BOOTSTRAP JARS -->
<copy todir="${jboss500.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
+ <patternset refid="lib.patternset"/>
</fileset>
</copy>
<!-- SERVER JARS -->
<copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{stacklibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
+ <patternset refid="native.patternset"/>
</fileset>
</copy>
@@ -566,40 +465,25 @@
<delete>
<!-- BIN SCRIPTS -->
<fileset dir="${jboss500.home}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- <include name="wsrunclient.*"/>
- <include name="wstools.*"/>
+ <patternset refid="bin.patternset"/>
</fileset>
<!-- CLIENT JARS -->
<fileset dir="${jboss500.home}/client">
- <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="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="policy.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-wsconsume-impl.jar"/>
+ <patternset refid="client.stack.patternset"/>
+ <patternset refid="client.patternset"/>
+ <patternset refid="bc.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">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-jaxws-ext.jar"/>
- <include name="jboss-saaj.jar"/>
- <!-- Remove only, do not deploy -->
- <include name="jbossws-integration.jar"/>
+ <patternset refid="native.patternset"/>
+ <patternset refid="bc.patternset"/>
</fileset>
</delete>
16 years, 11 months