[jbossws-commits] JBossWS SVN: r12235 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/resources/src/main/resources/resources and 3 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-05-14 07:21:44 -0400 (Fri, 14 May 2010) New Revision: 12235 Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml Removed: 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 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/ Modified: stack/cxf/branches/jbossws-cxf-3.1.2/build.xml stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml Log: Removing references to "Tech Preview" and "tp" Modified: stack/cxf/branches/jbossws-cxf-3.1.2/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2010-05-14 11:21:44 UTC (rev 12235) @@ -134,25 +134,25 @@ </zip> </target> - <target name="build-tp-installer" depends="prepare-deploy,os-init" description="Build the CXF Tech Preview Installer"> + <target name="build-installer" depends="prepare-deploy,os-init" description="Build the CXF stack installer"> <echo/> - <echo message="${mvn} ${maven.opts} -Ptp-installer package assembly:directory"/> + <echo message="${mvn} ${maven.opts} -Pinstaller package assembly:directory"/> <echo/> - <delete dir="${stack.output.dir}/jbossws-cxf-tp-installer"/> + <delete dir="${stack.output.dir}/jbossws-cxf-installer"/> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Ptp-installer dependency:tree"/> + <arg line="${maven.opts} -Pinstaller dependency:tree"/> </exec> <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Ptp-installer package assembly:directory"/> + <arg line="${maven.opts} -Pinstaller package assembly:directory"/> </exec> - <zip destfile="${stack.output.dir}/jbossws-cxf-tp-installer.zip"> + <zip destfile="${stack.output.dir}/jbossws-cxf-installer.zip"> <zipfileset - dir="${stack.output.dir}/jbossws-cxf-tp-installer" + dir="${stack.output.dir}/jbossws-cxf-installer" includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example" - prefix="jbossws-cxf-tp-installer"/> + prefix="jbossws-cxf-installer"/> </zip> </target> Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf (from rev 12228, 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-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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-* Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf ___________________________________________________________________ Name: svn:mergeinfo + Deleted: 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 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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/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-* Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf (from rev 12228, 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-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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-* Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf ___________________________________________________________________ Name: svn:mergeinfo + Deleted: 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 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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/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-* Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml (from rev 12228, 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-installer-macros.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml 2010-05-14 11:21:44 UTC (rev 12235) @@ -0,0 +1,361 @@ +<?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="**/cxf-*.jar"/> + <include name="**/commons-lang.jar"/> + <include name="**/jbossws-cxf-client*.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="**/XmlSchema.jar"/> + <include name="**/velocity.jar"/> + <!-- Do not replace these until they are really different + from the ones shipped with the JBoss ative EAP AS --> + <!-- <include name="**/jbossws-spi.jar"/> --> + <!-- <include name="**/jbossws-common.jar"/> --> + <!-- <include name="**/jbossws-framework.jar"/> --> + <!-- Already in the AS endorsed dir --> + <!-- <include name="**/xml-resolver.jar"/> --> + </patternset> + <!-- Copy these ones from the EAP AS common/lib so the MD5 is the same --> + <patternset id="jbossws.client.patternset2"> + <include name="**/asm.jar"/> + <include name="**/commons-collections.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="**/nothing-to-deploy"/> + <!-- Do not replace these until they are really different + from the ones shipped with the JBoss ative EAP AS --> + <!-- <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"/> + <!-- ws-metadata --> + <include name="**/jsr181-api.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="**/wss4j.jar"/> + <include name="**/XmlSchema.jar"/> + <!-- The ones below are not removed and there are no changes to them + so there is no need to override what is already there --> + <!-- <include name="**/FastInfoset.jar"/> --> + <!-- <include name="**/xmlsec.jar"/> --> + <!-- <include name="**/wsdl4j.jar"/> --> + <!-- Already in the AS common/lib and thus visible --> + <!-- <include name="**/asm.jar"/> --> + <!-- <include name="**/geronimo-javamail*.jar"/> --> + <!-- Already in the AS endorsed dir and thus visible --> + <!-- <include name="**/xml-resolver.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" verbose="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" verbose="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" verbose="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" verbose="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + <!-- [JBWS-2505] --> + <!-- START --> + <!-- + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> + <!-- END --> + </fileset> + </copy> + <!-- Copy these ones from the EAP AS common/lib so the MD5 is the same --> + <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true"> + <fileset dir="@{thirdpartydir}/../../common/lib"> + <patternset refid="jbossws.client.patternset2"/> + </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" verbose="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" verbose="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" verbose="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" verbose="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/nothing-to-deploy"/> + <!-- <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" verbose="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}"/> + <!-- No need to do this until we are actually changing something in it + <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 verbose="true"> + <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 verbose="true"> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"> + <exclude name="**/jbossws-spi.jar"/> + <exclude name="**/jbossws-common.jar"/> + <exclude name="**/jbossws-framework.jar"/> + </fileset> + </delete> + + <!-- delete jbossws.sar --> + <delete dir="@{targetdir}" verbose="true"/> + + <!-- No need to do this until we are actually changing something in it --> + <!-- delete juddi-service.sar --> + <!-- <delete dir="@{targetdir}/../juddi-service.sar" verbose="true"/> --> + + </sequential> + </macrodef> + +</project> Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: 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 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2010-05-14 11:21:44 UTC (rev 12235) @@ -1,361 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<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="**/cxf-*.jar"/> - <include name="**/commons-lang.jar"/> - <include name="**/jbossws-cxf-client*.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="**/XmlSchema.jar"/> - <include name="**/velocity.jar"/> - <!-- Do not replace these until they are really different - from the ones shipped with the JBoss ative EAP AS --> - <!-- <include name="**/jbossws-spi.jar"/> --> - <!-- <include name="**/jbossws-common.jar"/> --> - <!-- <include name="**/jbossws-framework.jar"/> --> - <!-- Already in the AS endorsed dir --> - <!-- <include name="**/xml-resolver.jar"/> --> - </patternset> - <!-- Copy these ones from the EAP AS common/lib so the MD5 is the same --> - <patternset id="jbossws.client.patternset2"> - <include name="**/asm.jar"/> - <include name="**/commons-collections.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="**/nothing-to-deploy"/> - <!-- Do not replace these until they are really different - from the ones shipped with the JBoss ative EAP AS --> - <!-- <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"/> - <!-- ws-metadata --> - <include name="**/jsr181-api.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="**/wss4j.jar"/> - <include name="**/XmlSchema.jar"/> - <!-- The ones below are not removed and there are no changes to them - so there is no need to override what is already there --> - <!-- <include name="**/FastInfoset.jar"/> --> - <!-- <include name="**/xmlsec.jar"/> --> - <!-- <include name="**/wsdl4j.jar"/> --> - <!-- Already in the AS common/lib and thus visible --> - <!-- <include name="**/asm.jar"/> --> - <!-- <include name="**/geronimo-javamail*.jar"/> --> - <!-- Already in the AS endorsed dir and thus visible --> - <!-- <include name="**/xml-resolver.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" verbose="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" verbose="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" verbose="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" verbose="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> - <!-- [JBWS-2505] --> - <!-- START --> - <!-- - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> - <!-- END --> - </fileset> - </copy> - <!-- Copy these ones from the EAP AS common/lib so the MD5 is the same --> - <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true"> - <fileset dir="@{thirdpartydir}/../../common/lib"> - <patternset refid="jbossws.client.patternset2"/> - </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" verbose="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" verbose="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" verbose="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" verbose="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/nothing-to-deploy"/> - <!-- <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" verbose="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}"/> - <!-- No need to do this until we are actually changing something in it - <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 verbose="true"> - <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 verbose="true"> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"> - <exclude name="**/jbossws-spi.jar"/> - <exclude name="**/jbossws-common.jar"/> - <exclude name="**/jbossws-framework.jar"/> - </fileset> - </delete> - - <!-- delete jbossws.sar --> - <delete dir="@{targetdir}" verbose="true"/> - - <!-- No need to do this until we are actually changing something in it --> - <!-- delete juddi-service.sar --> - <!-- <delete dir="@{targetdir}/../juddi-service.sar" verbose="true"/> --> - - </sequential> - </macrodef> - -</project> Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf (from rev 12228, 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-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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-* Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf ___________________________________________________________________ Name: svn:mergeinfo + Deleted: 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 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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/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-* Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf (from rev 12228, 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-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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-* Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf ___________________________________________________________________ Name: svn:mergeinfo + Deleted: 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 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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/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-* Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf (from rev 12228, 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-installer.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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-* Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf ___________________________________________________________________ Name: svn:mergeinfo + Deleted: 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 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-tp-installer.conf 2010-05-14 11:21:44 UTC (rev 12235) @@ -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/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-* Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-14 11:21:44 UTC (rev 12235) @@ -724,21 +724,21 @@ </profile> <!-- - Name: tp-installer - Descr: Build the CXF Tech Preview Installer + Name: installer + Descr: Build the CXF Installer --> <profile> - <id>tp-installer</id> + <id>installer</id> <build> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>jbossws-cxf-tp-installer</finalName> + <finalName>jbossws-cxf-installer</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>src/main/scripts/assembly-tp-installer.xml</descriptor> + <descriptor>src/main/scripts/assembly-installer.xml</descriptor> </descriptors> </configuration> </plugin> Copied: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer (from rev 12228, stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer) Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer ___________________________________________________________________ Name: svn:mergeinfo + Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/build-deploy.xml 2010-05-13 15:38:57 UTC (rev 12228) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml 2010-05-14 11:21:44 UTC (rev 12235) @@ -59,7 +59,7 @@ <!-- ================================================================== --> <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51"> - <fail message="Please make sure you're running this script from $JBOSS_HOME/jbossws-cxf-tp-installer" unless="jboss510.available"/> + <fail message="Please make sure you're running this script from $JBOSS_HOME/jbossws-cxf-installer" unless="jboss510.available"/> <copy todir="${jboss510.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> </copy> @@ -67,7 +67,7 @@ </target> <target name="undeploy-jboss510" depends="init"> - <fail message="Please make sure you're running this script from your $JBOSS_HOME/jbossws-cxf-tp-installer" unless="jboss510.available"/> + <fail message="Please make sure you're running this script from your $JBOSS_HOME/jbossws-cxf-installer" unless="jboss510.available"/> <macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/all/deploy/jbossws.sar" defaultconf="${jbossws.all.deploy.conf}"/> <macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/production/deploy/jbossws.sar" defaultconf="${jbossws.production.deploy.conf}"/> <macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/web/deploy/jbossws.sar" defaultconf="${jbossws.web.deploy.conf}"/> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/tp-installer/build.xml 2010-05-13 15:38:57 UTC (rev 12228) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml 2010-05-14 11:21:44 UTC (rev 12235) @@ -9,7 +9,7 @@ <!-- --> <!-- ====================================================================== --> -<project basedir="." name="JBossWS-CXF-TP-Installer" default="install"> +<project basedir="." name="JBossWS-CXF-Installer" default="install"> <!-- ================================================================== --> <!-- Setup --> @@ -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-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.default.deploy.conf" value="${build.dir}/default-deploy-installer.conf"/> + <property name="jbossws.standard.deploy.conf" value="${build.dir}/standard-deploy-installer.conf"/> + <property name="jbossws.production.deploy.conf" value="${build.dir}/production-deploy-installer.conf"/> + <property name="jbossws.web.deploy.conf" value="${build.dir}/web-deploy-installer.conf"/> + <property name="jbossws.all.deploy.conf" value="${build.dir}/all-deploy-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-tp-installer-macros.xml"/> + <import file="${build.dir}/jbossws-installer-macros.xml"/> <!-- ================================================================== --> <!-- Initialization --> @@ -52,10 +52,8 @@ <!-- dummy targets --> <target name="prepare-deploy" depends="init"/> - <target name="install" depends="clean, deploy-jboss510" description="Install JBossWS-CXF Tech Preview"> + <target name="install" depends="clean, deploy-jboss510" description="Install JBossWS-CXF"> <echo message="-----------------------------------------------------------------------"/> - <echo message=" WARNING: JBossWS-CXF Tech Preview is not meant for production use yet"/> - <echo message="-----------------------------------------------------------------------"/> </target> <target name="clean" depends="prepare"> Copied: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml (from rev 12228, 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-installer.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml 2010-05-14 11:21:44 UTC (rev 12235) @@ -0,0 +1,76 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>tech-preview-installer</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <!-- root --> + <fileSet> + <directory>src/main/installer</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>build.xml</include> + </includes> + </fileSet> + <!-- build --> + <fileSet> + <directory>src/main/installer</directory> + <outputDirectory>build</outputDirectory> + <includes> + <include>build-deploy.xml</include> + <include>build-setup.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>modules/resources/src/main/resources/resources</directory> + <outputDirectory>build</outputDirectory> + <includes> + <include>default-deploy-installer.conf</include> + <include>standard-deploy-installer.conf</include> + <include>all-deploy-installer.conf</include> + <include>production-deploy-installer.conf</include> + <include>web-deploy-installer.conf</include> + <include>jbossws-installer-macros.xml</include> + </includes> + </fileSet> + <!-- docs --> + <fileSet> + <directory>src/main/installer</directory> + <outputDirectory>docs</outputDirectory> + <filtered>true</filtered> + <includes> + <include>Install.txt</include> + <include>JBossORG-EULA.txt</include> + </includes> + </fileSet> + <!-- 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> + <exclude>**/lib/jbossws-spi.jar</exclude> + <exclude>**/lib/jbossws-common.jar</exclude> + <exclude>**/lib/jbossws-framework.jar</exclude> + <exclude>**/lib/xml-resolver.jar</exclude> + <exclude>**/lib/asm.jar</exclude> + <exclude>**/lib/commons-collections.jar</exclude> + <exclude>**/lib/FastInfoset.jar</exclude> + <exclude>**/lib/xmlsec.jar</exclude> + <exclude>**/lib/wsdl4j.jar</exclude> + <exclude>**/lib/juddi-service.sar</exclude> + <exclude>**/lib/scout.jar</exclude> + <exclude>**/lib/juddi.jar</exclude> + </excludes> + </fileSet> + </fileSets> + +</assembly> Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: 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 2010-05-14 10:04:52 UTC (rev 12234) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-tp-installer.xml 2010-05-14 11:21:44 UTC (rev 12235) @@ -1,76 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>tech-preview-installer</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <!-- root --> - <fileSet> - <directory>src/main/tp-installer</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>build.xml</include> - </includes> - </fileSet> - <!-- build --> - <fileSet> - <directory>src/main/tp-installer</directory> - <outputDirectory>build</outputDirectory> - <includes> - <include>build-deploy.xml</include> - <include>build-setup.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>modules/resources/src/main/resources/resources</directory> - <outputDirectory>build</outputDirectory> - <includes> - <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 --> - <fileSet> - <directory>src/main/tp-installer</directory> - <outputDirectory>docs</outputDirectory> - <filtered>true</filtered> - <includes> - <include>Install.txt</include> - <include>JBossORG-EULA.txt</include> - </includes> - </fileSet> - <!-- 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> - <exclude>**/lib/jbossws-spi.jar</exclude> - <exclude>**/lib/jbossws-common.jar</exclude> - <exclude>**/lib/jbossws-framework.jar</exclude> - <exclude>**/lib/xml-resolver.jar</exclude> - <exclude>**/lib/asm.jar</exclude> - <exclude>**/lib/commons-collections.jar</exclude> - <exclude>**/lib/FastInfoset.jar</exclude> - <exclude>**/lib/xmlsec.jar</exclude> - <exclude>**/lib/wsdl4j.jar</exclude> - <exclude>**/lib/juddi-service.sar</exclude> - <exclude>**/lib/scout.jar</exclude> - <exclude>**/lib/juddi.jar</exclude> - </excludes> - </fileSet> - </fileSets> - -</assembly>