JBossWS SVN: r5573 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 06:28:26 -0500 (Wed, 06 Feb 2008)
New Revision: 5573
Modified:
stack/native/trunk/ant-import/macros-deploy-native.xml
Log:
[JBWS-1982] optimization
Modified: stack/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-06 09:51:57 UTC (rev 5572)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-06 11:28:26 UTC (rev 5573)
@@ -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
JBossWS SVN: r5572 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-06 04:51:57 -0500 (Wed, 06 Feb 2008)
New Revision: 5572
Modified:
stack/metro/trunk/build.xml
Log:
Include mimepull.jar in SAR
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-02-06 09:50:49 UTC (rev 5571)
+++ stack/metro/trunk/build.xml 2008-02-06 09:51:57 UTC (rev 5572)
@@ -239,6 +239,7 @@
<include name="jsr181-api.jar"/>
<include name="jsr173_api.jar"/>
<include name="jsr250-api.jar"/>
+ <include name="mimepull.jar"/>
<include name="saaj-api.jar"/>
<include name="saaj-impl.jar"/>
<include name="sjsxp.jar"/>
16 years, 11 months
JBossWS SVN: r5571 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-06 04:50:49 -0500 (Wed, 06 Feb 2008)
New Revision: 5571
Modified:
stack/metro/trunk/ant-import/build-metro.xml
Log:
Fix broken build
Modified: stack/metro/trunk/ant-import/build-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/build-metro.xml 2008-02-06 09:06:55 UTC (rev 5570)
+++ stack/metro/trunk/ant-import/build-metro.xml 2008-02-06 09:50:49 UTC (rev 5571)
@@ -34,10 +34,7 @@
<target name="checkout" depends="init, -cvs.init, -cvs.message" unless="same.checkout"
description="Checkout/Update the local metro sources">
-
- <!-- force clean -->
- <antcall target="clean.cvs"/>
-
+
<mkdir dir="${cvs.dir}"/>
<echo>**********************************</echo>
16 years, 11 months
JBossWS SVN: r5570 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-06 04:06:55 -0500 (Wed, 06 Feb 2008)
New Revision: 5570
Modified:
stack/metro/trunk/build.xml
Log:
mimepull.jar must be in sar structure as well
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-02-05 20:22:28 UTC (rev 5569)
+++ stack/metro/trunk/build.xml 2008-02-06 09:06:55 UTC (rev 5570)
@@ -179,6 +179,7 @@
<include name="sjsxp.jar"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
+ <include name="mimepull.jar"/>
<include name="jsr173_api.jar"/>
<include name="jsr181-api.jar"/>
@@ -243,6 +244,7 @@
<include name="sjsxp.jar"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
+ <include name="mimepull.jar"/>
</fileset>
<!-- Any extra metro jar, including metro-rt.jar -->
16 years, 11 months
JBossWS SVN: r5569 - 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-05 15:22:28 -0500 (Tue, 05 Feb 2008)
New Revision: 5569
Modified:
stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-framework.xml
Log:
[JBWS-1982] optimization
Modified: 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-05 20:22:06 UTC (rev 5568)
+++ stack/native/branches/jbossws-native-2.0.3.QA/ant-import/macros-deploy-framework.xml 2008-02-05 20:22:28 UTC (rev 5569)
@@ -13,60 +13,60 @@
<project>
- <macrodef name="macro-deploy-framework">
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
+ <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"/>
-
+ <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>
-
+ <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>
+ <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>
+ <macrodef name="macro-undeploy-framework">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
<!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
+ <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>
-
+ <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>
+ <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>
\ No newline at end of file
+</project>
16 years, 11 months
JBossWS SVN: r5568 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-05 15:22:06 -0500 (Tue, 05 Feb 2008)
New Revision: 5568
Modified:
stack/native/trunk/ant-import/macros-deploy-framework.xml
Log:
[JBWS-1982] optimization
Modified: stack/native/trunk/ant-import/macros-deploy-framework.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 19:56:17 UTC (rev 5567)
+++ stack/native/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 20:22:06 UTC (rev 5568)
@@ -13,60 +13,60 @@
<project>
- <macrodef name="macro-deploy-framework">
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
+ <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"/>
-
+ <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>
-
+ <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>
+ <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>
+ <macrodef name="macro-undeploy-framework">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
<!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
+ <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>
-
+ <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>
+ <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>
\ No newline at end of file
+</project>
16 years, 11 months
JBossWS SVN: r5567 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-05 14:56:17 -0500 (Tue, 05 Feb 2008)
New Revision: 5567
Modified:
stack/metro/trunk/ant-import/build-deploy.xml
stack/metro/trunk/ant-import/macros-deploy-framework.xml
stack/metro/trunk/ant-import/macros-deploy-sunri.xml
Log:
[JBWS-1982] optimization
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2008-02-05 19:12:33 UTC (rev 5566)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-05 19:56:17 UTC (rev 5567)
@@ -13,67 +13,64 @@
<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"/>
+ <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
- <!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
- <target name="deploy-jboss422" depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
- <macro-deploy-sunri422
- stacklibs="${int.sunri.dir}/output/lib"
- thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+ <target name="deploy-jboss422" depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42">
+ <macro-deploy-sunri422
+ stacklibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-framework
- thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss422.home}"/>
- </target>
+ <macro-deploy-framework
+ thirdpartylibs="${int.sunri.dir}/thirdparty"
+ jbosshome="${jboss422.home}"/>
+ </target>
- <!-- Remove from jboss422 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri422/>
- <macro-undeploy-framework jbosshome="${jboss422.home}"/>
- </target>
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri422/>
+ <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">
- <macro-deploy-sunri423
- stacklibs="${int.sunri.dir}/output/lib"
- thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+ <target name="deploy-jboss423" depends="jars-jboss423, undeploy-jboss423" description="Deploy jbossws/sunri to jboss42">
+ <macro-deploy-sunri423
+ stacklibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-framework
- thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss423.home}"/>
- </target>
+ <macro-deploy-framework
+ thirdpartylibs="${int.sunri.dir}/thirdparty"
+ jbosshome="${jboss423.home}"/>
+ </target>
- <!-- Remove from jboss423 -->
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42">
- <macro-undeploy-sunri423/>
- <macro-undeploy-framework jbosshome="${jboss423.home}"/>
- </target>
+ <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42">
+ <macro-undeploy-sunri423/>
+ <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">
- <macro-deploy-sunri500
- stacklibs="${int.sunri.dir}/output/lib"
- thirdpartylibs="${int.sunri.dir}/thirdparty"/>
+ <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50">
+ <macro-deploy-sunri500
+ stacklibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-framework
- thirdpartylibs="${int.sunri.dir}/thirdparty"
- jbosshome="${jboss500.home}"/>
- </target>
+ <macro-deploy-framework
+ thirdpartylibs="${int.sunri.dir}/thirdparty"
+ jbosshome="${jboss500.home}"/>
+ </target>
- <!-- Remove from jboss500 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri500/>
- <macro-undeploy-framework jbosshome="${jboss500.home}"/>
- </target>
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ </target>
</project>
Modified: stack/metro/trunk/ant-import/macros-deploy-framework.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 19:12:33 UTC (rev 5566)
+++ stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 19:56:17 UTC (rev 5567)
@@ -13,60 +13,60 @@
<project>
- <macrodef name="macro-deploy-framework">
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
+ <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"/>
-
+ <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>
-
+ <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>
+ <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>
+ <macrodef name="macro-undeploy-framework">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
<!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
+ <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>
-
+ <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>
+ <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>
\ No newline at end of file
+</project>
Modified: stack/metro/trunk/ant-import/macros-deploy-sunri.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-05 19:12:33 UTC (rev 5566)
+++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-05 19:56:17 UTC (rev 5567)
@@ -13,222 +13,200 @@
<project>
- <!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
+ <patternset id="client.stack.patternset">
+ <include name="jbossws-sunri-client.jar"/>
+ </patternset>
- <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}">
- <include name="jbossws-sunri-client.jar"/>
- </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="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"/>
- </fileset>
- </copy>
- <copy todir="${jboss422.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </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>
+ <patternset id="client.patternset">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ </patternset>
- <!-- Remove jbossws/sunri from jboss422 -->
- <macrodef name="macro-undeploy-sunri422">
- <sequential>
- <delete>
- <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="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="jbossws-sunri-client.jar"/>
- </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>
+ <patternset id="lib.patternset">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </patternset>
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
+ <patternset id="serverlib.patternset">
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ </patternset>
- <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}">
- <include name="jbossws-sunri-client.jar"/>
- </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="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"/>
- </fileset>
- </copy>
- <copy todir="${jboss423.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </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>
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
- <!-- Remove jbossws/sunri from jboss423 -->
- <macrodef name="macro-undeploy-sunri423">
- <sequential>
- <delete>
- <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="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="jbossws-sunri-client.jar"/>
- <include name="jboss-wsit-tools.jar"/>
- </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>
+ <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>
- <!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
- <!-- ================================================================== -->
+ <!-- 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>
- <macrodef name="macro-deploy-sunri500">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <!-- BOOTSTRAP JARS -->
+ <fileset dir="${jboss422.home}/lib">
+ <patternset refid="lib.patternset"/>
+ </fileset>
+ </delete>
- <!-- CLIENT JARS -->
- <copy todir="${jboss500.home}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <include name="jbossws-sunri-client.jar"/>
- </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="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"/>
- </fileset>
- </copy>
+ <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>
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss500.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
+ <!-- ================================================================== -->
+ <!-- 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}">
- <include name="jaxws-api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="saaj-api.jar"/>
- </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>
+ <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>
+ <!-- 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>
- <!-- 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="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="jbossws-sunri-client.jar"/>
- </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>
- <!-- SERVER JARS -->
- <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
- <include name="jaxws-api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="saaj-api.jar"/>
- </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>
+ <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>
16 years, 11 months
JBossWS SVN: r5566 - stack/cxf/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-05 14:12:33 -0500 (Tue, 05 Feb 2008)
New Revision: 5566
Modified:
stack/cxf/trunk/ant-import/build-deploy.xml
stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
stack/cxf/trunk/ant-import/macros-deploy-framework.xml
Log:
[JBWS-1982] optimization
Modified: stack/cxf/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-05 12:58:25 UTC (rev 5565)
+++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-05 19:12:33 UTC (rev 5566)
@@ -13,62 +13,64 @@
<project>
- <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml"/>
+ <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml"/>
<import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/>
-
+
<!-- ================================================================== -->
- <!-- Deployment -->
+ <!-- Deployment JBoss422 -->
<!-- ================================================================== -->
-
- <!-- Deploy to jboss500 -->
- <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss500">
- <macro-deploy-cxf500
- stacklibs="${int.cxf.dir}/output/lib"
- thirdpartylibs="${int.cxf.dir}/thirdparty"/>
- <macro-deploy-framework
- thirdpartylibs="${int.cxf.dir}/thirdparty"
- jbosshome="${jboss500.home}"/>
- </target>
-
- <!-- Remove from jboss500 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500">
- <macro-undeploy-cxf500/>
- <macro-undeploy-framework jbosshome="${jboss500.home}"/>
- </target>
-
- <!-- Deploy to jboss422 -->
<target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss422">
<macro-deploy-cxf422
stacklibs="${int.cxf.dir}/output/lib"
thirdpartylibs="${int.cxf.dir}/thirdparty"/>
-
- <macro-deploy-framework
- thirdpartylibs="${int.cxf.dir}/thirdparty"
- jbosshome="${jboss422.home}"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.cxf.dir}/thirdparty"
+ jbosshome="${jboss422.home}"/>
</target>
- <!-- Remove from jboss422 -->
<target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422">
<macro-undeploy-cxf422/>
- <macro-undeploy-framework jbosshome="${jboss422.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
- <!-- Deploy to jboss423 -->
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
<target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss423">
<macro-deploy-cxf423
stacklibs="${int.cxf.dir}/output/lib"
thirdpartylibs="${int.cxf.dir}/thirdparty"/>
-
- <macro-deploy-framework
- thirdpartylibs="${int.cxf.dir}/thirdparty"
- jbosshome="${jboss423.home}"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.cxf.dir}/thirdparty"
+ jbosshome="${jboss423.home}"/>
</target>
-
- <!-- Remove from jboss423 -->
+
<target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423">
<macro-undeploy-cxf423/>
- <macro-undeploy-framework jbosshome="${jboss423.home}"/>
+ <macro-undeploy-framework jbosshome="${jboss423.home}"/>
</target>
-
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss500">
+ <macro-deploy-cxf500
+ stacklibs="${int.cxf.dir}/output/lib"
+ thirdpartylibs="${int.cxf.dir}/thirdparty"/>
+
+ <macro-deploy-framework
+ thirdpartylibs="${int.cxf.dir}/thirdparty"
+ jbosshome="${jboss500.home}"/>
+ </target>
+
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500">
+ <macro-undeploy-cxf500/>
+ <macro-undeploy-framework jbosshome="${jboss500.home}"/>
+ </target>
+
</project>
Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-05 12:58:25 UTC (rev 5565)
+++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-05 19:12:33 UTC (rev 5566)
@@ -13,170 +13,190 @@
<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 -->
+ <!-- Deployment JBoss422 -->
<!-- ================================================================== -->
-
- <!-- 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}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- </copy>
-
- <!-- BOOTSTRAP JARS -->
- <copy todir="${jboss500.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
-
- <!--SERVER JARS -->
- <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
- <include name="saaj-api-${cxf.saaj}.jar"/>
- </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">
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
-
- <!-- BOOTSTRAP JARS -->
- <fileset dir="${jboss500.home}/lib">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
-
- <!--SERVER JARS -->
- <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib">
- <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
- <include name="saaj-api-${cxf.saaj}.jar"/>
- </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>
-
<!-- Deploy jbossws/cxf to jboss422 -->
<macrodef name="macro-deploy-cxf422">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <!-- CLIENT JARS -->
+ <!-- CLIENT JARS -->
<copy todir="${jboss422.home}/client" overwrite="true">
<fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
+ <patternset refid="client.patternset"/>
</fileset>
</copy>
-
- <!-- BOOTSTRAP JARS -->
+
+ <!-- BOOTSTRAP JARS -->
<copy todir="${jboss422.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 -->
+ <!--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"/>
+ <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 -->
+ <!-- CLIENT JARS -->
<fileset dir="${jboss422.home}/client">
- <include name="jbossws-spi.jar"/>
+ <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"/>
+ <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"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <!-- CLIENT JARS -->
+ <!-- CLIENT JARS -->
<copy todir="${jboss423.home}/client" overwrite="true">
<fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
+ <patternset refid="client.patternset"/>
</fileset>
</copy>
- <!-- BOOTSTRAP JARS -->
+ <!-- BOOTSTRAP JARS -->
<copy todir="${jboss423.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 -->
+
+ <!--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"/>
+ <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 -->
+ <!-- CLIENT JARS -->
<fileset dir="${jboss423.home}/client">
- <include name="jbossws-spi.jar"/>
+ <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"/>
+ <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>
Modified: stack/cxf/trunk/ant-import/macros-deploy-framework.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 12:58:25 UTC (rev 5565)
+++ stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-05 19:12:33 UTC (rev 5566)
@@ -13,60 +13,60 @@
<project>
- <macrodef name="macro-deploy-framework">
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
+ <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"/>
-
+ <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>
-
+ <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>
+ <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>
+ <macrodef name="macro-undeploy-framework">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
<!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
+ <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>
-
+ <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>
+ <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>
\ No newline at end of file
+</project>
16 years, 11 months
JBossWS SVN: r5565 - in stack/metro/trunk: ant-import-tests and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-05 07:58:25 -0500 (Tue, 05 Feb 2008)
New Revision: 5565
Modified:
stack/metro/trunk/ant-import-tests/build-testsuite.xml
stack/metro/trunk/ant-import/metro-build-adapter.xml
stack/metro/trunk/src/main/distro/bin-dist-build.xml
Log:
Attachment tests require mimepull.jar in class classpath
Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml
===================================================================
--- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-02-05 11:33:15 UTC (rev 5564)
+++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-02-05 12:58:25 UTC (rev 5565)
@@ -68,8 +68,7 @@
<!-- Metro 3rd party thats not available through repo.jboss.com -->
<fileset dir="${lib.runtime.dir}">
- <include name="jaxws-local-transport.jar"/>
- <include name="mimepull.jar"/>
+ <include name="jaxws-local-transport.jar"/>
<include name="stax-utils.jar"/>
<include name="txnannprocessor.jar"/>
<include name="wstx-asl-3.2.1.jar"/>
Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-05 11:33:15 UTC (rev 5564)
+++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-05 12:58:25 UTC (rev 5565)
@@ -38,7 +38,7 @@
<pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-tools.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-rt.jar"/>
- <pathelement location="${int.sunri.dir}/thirdparty-gen/mimepull.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/mimepull.jar"/>
<!--pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/>
Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-05 11:33:15 UTC (rev 5564)
+++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-05 12:58:25 UTC (rev 5565)
@@ -114,6 +114,7 @@
<pathelement location="${lib.dir}/jsr173_api.jar"/>
<pathelement location="${lib.dir}/jsr181-api.jar"/>
<pathelement location="${lib.dir}/jsr250-api.jar"/>
+ <pathelement location="${lib.dir}/mimepull.jar"/>
<pathelement location="${lib.dir}/resolver.jar"/>
<pathelement location="${lib.dir}/saaj-api.jar"/>
<pathelement location="${lib.dir}/saaj-impl.jar"/>
16 years, 11 months
JBossWS SVN: r5564 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-05 06:33:15 -0500 (Tue, 05 Feb 2008)
New Revision: 5564
Modified:
stack/metro/trunk/version.properties
Log:
Keep 2.1.0.DEV version until framework is fixed
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-02-05 10:02:32 UTC (rev 5563)
+++ stack/metro/trunk/version.properties 2008-02-05 11:33:15 UTC (rev 5564)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-3.0
-version.id=1.0.0.DEV
+version.id=2.1.0.DEV
repository.id=snapshot
implementation.title=JBoss Web Services - Sun Metro
16 years, 11 months