Author: alessio.soldano(a)jboss.com Date: 2009-11-24 08:43:45 -0500 (Tue, 24 Nov 2009) New Revision: 11145 Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf Removed: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy.conf Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/build.xml Log: [JBPAPP-3094] tech preview installer: do not overwrite libs already available in AS Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja! r server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy.conf 2009-11-23 19:47:05 UTC (rev 11144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja! r server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-11-24 13:43:45 UTC (rev 11145) @@ -0,0 +1,333 @@ +<?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. --> +<!-- --> +<!-- ====================================================================== --> + +<project> + + <!-- + These patterns should be common for all supported containers. + All jars must also be declared in component-info.xml to ensure + that the AS build uses the same version. + --> + <patternset id="jbossws.bin.patternset"> + <include name="**/wsconsume.bat"/> + <include name="**/wsconsume.sh"/> + <include name="**/wsprovide.bat"/> + <include name="**/wsprovide.sh"/> + <include name="**/wsrunclient.bat"/> + <include name="**/wsrunclient.sh"/> + </patternset> + + <patternset id="jbossws.client.patternset"> + <include name="**/asm.jar"/> + <include name="**/cxf-*.jar"/> + <include name="**/commons-collections.jar"/> + <include name="**/commons-lang.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-cxf-client*.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> + <include name="**/velocity.jar"/> + </patternset> + + <patternset id="jbossws.lib.patternset"> + <include name="**/nothing-to-deploy"/> + </patternset> + + <patternset id="jbossws.lib.endorsed.patternset"> + <include name="**/nothing-to-deploy"/> + </patternset> + + <patternset id="jbossws.server.lib.patternset"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + </patternset> + + <patternset id="jbossws.service.lib.patternset"> + <include name="**/cxf-*.jar"/> + <!-- <include name="**/geronimo-javamail*.jar"/> --> + <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-cxf-client*.jar"/> + <include name="**/jbossws-cxf-server*.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wss4j.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/xmlsec.jar"/> + <include name="**/asm.jar"/> + <include name="**/XmlSchema.jar"/> + <include name="**/FastInfoset.jar"/> + </patternset> + + + <!-- ================================================================== --> + <!-- Deploy Bin --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-bin"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/bin"> + <patternset refid="jbossws.bin.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-lib51"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Lib Endorsed --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-endorsed"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.endorsed.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Client --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-client51"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> + <!-- END --> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Server Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-server-lib51"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JUDDI Service --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-juddi-sar"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest="@{targetdir}"> + <fileset dir="@{thirdpartydir}"> + <include name="**/juddi-service.sar"/> + </fileset> + </unzip> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/juddi.jar"/> + <include name="**/scout.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS Service --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-cxf51-sar"> + <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf-management.war"/> + </fileset> + </unzip> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deployers --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deployers51"> + <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + </fileset> + </copy> + <copy todir="@{targetdir}"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> + </fileset> + </copy> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> + <!-- END --> + </fileset> + </copy> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <include name="**/jbossws-deployer-jboss-beans.xml"/> + </fileset> + </copy> + --> + <!-- END --> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS --> + <!-- ================================================================== --> + + <target name="deploy-jbossws-cxf51" depends="check-parameters"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! --> + <macro-deploy-jbossws-cxf51-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + </target> + + <target name="check-parameters"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="artifactsdir must be specified" unless="artifactsdir"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + </target> + + <!-- ================================================================== --> + <!-- Undeploy JBossWS --> + <!-- ================================================================== --> + + <macrodef name="macro-undeploy-jbossws51"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + + <!-- [JBWS-2505] --> + <!-- START --> + <!-- delete stale container integration jars --> + <!-- + <delete> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + --> + <!-- END --> + + <!-- delete content of last deployment --> + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + + <!-- delete jbossws.sar --> + <delete dir="@{targetdir}"/> + + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + + </sequential> + </macrodef> + +</project> Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja! r server/production/deploy/jbossws.sar server/production/deploy/juddi-service.sar server/production/deploy/jbossws-container-jboss-beans.xml server/production/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/production/deployers/jbossws.deployer/jbossws-native-core.jar server/production/deployers/jbossws.deployer/jettison.jar server/production/deployers/jbossws.deployer/policy.jar server/production/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy.conf 2009-11-23 19:47:05 UTC (rev 11144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/production/deploy/jbossws.sar server/production/deploy/juddi-service.sar server/production/deploy/jbossws-container-jboss-beans.xml server/production/deployers/jbossws.deployer/FastInfoset.jar server/production/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/production/deployers/jbossws.deployer/jbossws-native-core.jar server/production/deployers/jbossws.deployer/jettison.jar server/production/deployers/jbossws.deployer/policy.jar server/production/deployers/jbossws.deployer/wsdl4j.jar server/production/deployers/jbossws.deployer/xmlsec.jar server/production/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja! r server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy.conf 2009-11-23 19:47:05 UTC (rev 11144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.ja! r server/web/deploy/jbossws.sar server/web/deploy/juddi-service.sar server/web/deploy/jbossws-container-jboss-beans.xml server/web/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/web/deployers/jbossws.deployer/jbossws-native-core.jar server/web/deployers/jbossws.deployer/jettison.jar server/web/deployers/jbossws.deployer/policy.jar server/web/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy.conf 2009-11-23 19:47:05 UTC (rev 11144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy.conf 2009-11-24 13:43:45 UTC (rev 11145) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/web/deploy/jbossws.sar server/web/deploy/juddi-service.sar server/web/deploy/jbossws-container-jboss-beans.xml server/web/deployers/jbossws.deployer/FastInfoset.jar server/web/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/web/deployers/jbossws.deployer/jbossws-native-core.jar server/web/deployers/jbossws.deployer/jettison.jar server/web/deployers/jbossws.deployer/policy.jar server/web/deployers/jbossws.deployer/wsdl4j.jar server/web/deployers/jbossws.deployer/xmlsec.jar server/web/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml 2009-11-23 19:47:05 UTC (rev 11144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml 2009-11-24 13:43:45 UTC (rev 11145) @@ -29,12 +29,12 @@ <directory>modules/resources/src/main/resources/resources</directory> <outputDirectory>build</outputDirectory> <includes> - <include>default-deploy.conf</include> - <include>standard-deploy.conf</include> - <include>all-deploy.conf</include> - <include>production-deploy.conf</include> - <include>web-deploy.conf</include> - <include>jbossws-deploy-macros.xml</include> + <include>default-deploy-tp-installer.conf</include> + <include>standard-deploy-tp-installer.conf</include> + <include>all-deploy-tp-installer.conf</include> + <include>production-deploy-tp-installer.conf</include> + <include>web-deploy-tp-installer.conf</include> + <include>jbossws-tp-installer-macros.xml</include> </includes> </fileSet> <!-- docs --> @@ -47,10 +47,17 @@ <include>JBossORG-EULA.txt</include> </includes> </fileSet> - <!-- deploy --> + <!-- deploy (excludes libs already on EAP5) --> <fileSet> <directory>target/deploy-artifacts</directory> <outputDirectory>deploy</outputDirectory> + <excludes> + <exclude>**/jaxb-*.jar</exclude> + <exclude>**/junit.jar</exclude> + <exclude>**/mail.jar</exclude> + <exclude>**/stax-api.jar</exclude> + <exclude>**/wstx.jar</exclude> + </excludes> </fileSet> </fileSets> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/build.xml 2009-11-23 19:47:05 UTC (rev 11144) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/build.xml 2009-11-24 13:43:45 UTC (rev 11145) @@ -20,11 +20,11 @@ <property name="output.dir" value="${basedir}/output"/> <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/default-deploy.conf"/> - <property name="jbossws.standard.deploy.conf" value="${build.dir}/standard-deploy.conf"/> - <property name="jbossws.production.deploy.conf" value="${build.dir}/production-deploy.conf"/> - <property name="jbossws.web.deploy.conf" value="${build.dir}/web-deploy.conf"/> - <property name="jbossws.all.deploy.conf" value="${build.dir}/all-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/default-deploy-tp-installer.conf"/> + <property name="jbossws.standard.deploy.conf" value="${build.dir}/standard-deploy-tp-installer.conf"/> + <property name="jbossws.production.deploy.conf" value="${build.dir}/production-deploy-tp-installer.conf"/> + <property name="jbossws.web.deploy.conf" value="${build.dir}/web-deploy-tp-installer.conf"/> + <property name="jbossws.all.deploy.conf" value="${build.dir}/all-deploy-tp-installer.conf"/> <property name="jbossws.integration.target" value="jboss510"/> <property name="jboss510.home" value="${basedir}/.."/> @@ -32,7 +32,7 @@ <import file="${build.dir}/build-setup.xml"/> <import file="${build.dir}/build-deploy.xml"/> - <import file="${build.dir}/jbossws-deploy-macros.xml"/> + <import file="${build.dir}/jbossws-tp-installer-macros.xml"/> <!-- ================================================================== --> <!-- Initialization -->