Author: thomas.diesler(a)jboss.com Date: 2008-04-23 12:06:36 -0400 (Wed, 23 Apr 2008) New Revision: 6636 Added: stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml Removed: stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/profiles-example.xml Log: deploy based on deploy-artifacts Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -17,13 +17,12 @@ <!-- Prepare Deployment Structure JBoss-4.2.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss42" depends="prepare"> + <target name="deploy-structure-jboss42" depends="prepare-deploy"> <delete dir="${deploy.structure.jboss42}"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="-Denv=jboss422"/> - <arg value="package"/> - <arg value="assembly:directory"/> - </exec> + <antcall target="deploy-jbossws-cxf42" inheritall="false"> + <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> </target> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -92,12 +92,12 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/bin"> <patternset refid="jbossws.bin.patternset"/> </fileset> </copy> @@ -195,15 +195,13 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-jbossws-cxf42-sar"> - <attribute name="thirdpartydir"/> - <attribute name="resourcesdir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/lib"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jbossws-deploy.conf"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/stax-api.jar"/> @@ -211,21 +209,20 @@ </fileset> </copy> <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management*.war"/> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> </fileset> </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf42-beans.xml"/> + <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; + <fileset dir="@{artifactsdir}/resources/jbossws-beans42"> + <include name="META-INF/**"/> </fileset> </copy> - <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-cxf42-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;(a){thirdpartydir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; + <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; </copy> <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{resourcesdir}/META-INF"/> + <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-jboss42.sar/META-INF&quot;/&gt; </copy> </sequential> </macrodef> @@ -246,7 +243,7 @@ <include name="**/jbossws-cxf-context*.war"/> </fileset> </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> + <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot;&gt; <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-cxf50-beans.xml"/> </fileset> @@ -266,11 +263,11 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}"/> </target> <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -16,9 +16,7 @@ <property name="cxf.dir" value="${basedir}"/> <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-bin-dist.xml"/> <import file="${basedir}/ant-import/build-deploy.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/> <!-- ================================================================== --> @@ -30,8 +28,6 @@ <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/> <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/> - <property name="thirdparty.dir" value="${cxf.server.dir}/target/thirdparty"/> - <property name="cxf.src.dir" value="${cxf.dir}/src/main"/> <property name="cxf.etc.dir" value="${cxf.src.dir}/etc"/> <property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/> @@ -41,6 +37,7 @@ <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> <property name="cxf.output.resources.dir" value="${cxf.output.dir}/resources"/> + <property name="deploy.artifacts.dir" value="${cxf.output.dir}/deploy-artifacts"/> <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/> <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss50"/> <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> @@ -77,18 +74,24 @@ | Build all jar files. --> <target name="jars" depends="compile" description="Builds all jar files."> - - <!-- Run the maven build --> <exec dir="${basedir}" executable="mvn" failonerror="true"> <arg value="package"/> </exec> - </target> <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> + <target name="prepare-deploy" depends="prepare"> + <delete dir="${deploy.artifacts.dir}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="-Denv=${jbossws.integration.target}"/> + <arg value="package"/> + <arg value="assembly:directory"/> + </exec> + </target> + <target name="clean" depends="prepare" description="Cleans up most generated files."> <exec dir="${basedir}" executable="mvn" failonerror="true"> <arg value="clean"/> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -21,6 +21,7 @@ <module>modules/management</module> <module>modules/server</module> <module>modules/client</module> + <!--module>modules/testsuite</module--> </modules> <!-- Properties --> @@ -32,11 +33,11 @@ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version> <jboss.common.version>1.2.1.GA</jboss.common.version> - <juddi.service.version>1.2.0.GA</juddi.service.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> <jaxws.api.version>2.0</jaxws.api.version> + <juddi.service.version>1.2.0.GA</juddi.service.version> <saaj.api.version>1.3</saaj.api.version> </properties> @@ -210,19 +211,68 @@ <build> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <echo/> + <echo message="jboss.home=${jboss.home}"/> + <echo/> + <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> + <fail message="Invalid integration target: ${jboss.home}" unless="jboss.available"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>deploy-jboss422</finalName> + <finalName>deploy-artifacts</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>src/main/scripts/assembly-install-jboss422.xml</descriptor> + <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> </descriptors> </configuration> </plugin> + <!-- + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>jbossws-cxf-dist</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor> + </descriptors> + </configuration> + </plugin--> </plugins> </build> + <!-- Profiles --> + <profiles> + <profile> + <id>jboss422-user-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <properties> + <jbossws.integration.target>jboss422</jbossws.integration.target> + <jboss.home>${jboss422.home}</jboss.home> + </properties> + </profile> + </profiles> + <!-- Repositories --> <repositories> <repository> Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -2,17 +2,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> <profiles> - <!-- Defines the required integration properties --> - <profile> - <id>user-profile-cxf</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <jbossws.integration.target>jboss422</jbossws.integration.target> - </properties> - </profile> - <!-- This profile can also be defined in ~/.m2/settings.xml --> <profile> <id>user-profile-jboss</id> Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties (from rev 6632, stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,31 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +# Optional JBoss Home +jboss422.home=(a)jboss422.home@ +jboss423.home=(a)jboss423.home@ +jboss500.home=(a)jboss500.home@ +jboss501.home=(a)jboss501.home@ + +# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] +jbossws.integration.target=(a)jbossws.integration.target@ + +# The JBoss settings +jboss.server.instance=default +jboss.bind.address=localhost + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBoss JMX invoker authentication +#jmx.authentication.username=admin +#jmx.authentication.password=admin + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Deleted: stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-23 16:06:36 UTC (rev 6636) @@ -1,31 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ - -# Optional JBoss Home -jboss422.home=(a)jboss422.home@ -jboss423.home=(a)jboss423.home@ -jboss500.home=(a)jboss500.home@ -jboss501.home=(a)jboss501.home@ - -# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] -jbossws.integration.target=(a)jbossws.integration.target@ - -# The JBoss settings -jboss.server.instance=default -jboss.bind.address=localhost - -# JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository -jboss.repository=http://repository.jboss.org - -# JBoss JMX invoker authentication -#jmx.authentication.username=admin -#jmx.authentication.password=admin - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no Deleted: stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ --> - -<project default="main" basedir="." name="JBossWS-CXF"> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <property name="build.dir" value="${basedir}/build"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${basedir}/output"/> - - <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/> - <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - - <!-- JDK Detection --> - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/jbossws-deploy-macros.xml"/> - <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="prepare"> - - <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss500.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss422.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - <condition property="jboss.home" value="${jboss423.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - - <!-- Define excludesfile --> - <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> - - <path id="ws.stack.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${thirdparty.dir}/jdom-${cxf.jdom}.jar"/> - <pathelement location="${thirdparty.dir}/neethi-${cxf.neethi}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx-${cxf.wstx}.jar"/> - <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-cxf-client.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - </path> - - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - - <!-- dummy targets --> - <target name="prepare-deploy" depends="prepare"/> - - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${tests.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - -</project> \ No newline at end of file Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Prepare Deployment Structure JBoss-4.2.x --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss42" depends="prepare"> + <delete dir="${deploy.structure.jboss42}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="-Denv=jboss422"/> + <arg value="package"/> + <arg value="assembly:directory"/> + </exec> + <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss422 --> + <!-- ================================================================== --> + + <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <copy todir="${jboss422.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss42}"/> + </copy> + <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss423 --> + <!-- ================================================================== --> + + <target name="deploy-jboss423" depends="undeploy-jboss423" description="Deploy jbossws to jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <copy todir="${jboss423.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss42}"/> + </copy> + <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss500 --> + <!-- ================================================================== --> + + <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws to jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <copy todir="${jboss500.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss50}"/> + </copy> + <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss501 --> + <!-- ================================================================== --> + + <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws to jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <copy todir="${jboss501.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss50}"/> + </copy> + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> + <!-- Create jbossws-deploy.conf --> + <!-- ================================================================== --> + + <macrodef name="macro-create-deploy-conf"> + <attribute name="deploystructure"/> + <sequential> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> + <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> + <property name="jbossws.sar.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> + <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + </sequential> + </macrodef> + +</project> Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ --> + +<project default="main" basedir="." name="JBossWS-CXF"> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${basedir}/output"/> + + <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> + <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/> + <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> + + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> + </condition> + + <!-- JDK Detection --> + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + + <import file="${basedir}/build/build-deploy.xml"/> + <import file="${basedir}/build/jbossws-deploy-macros.xml"/> + <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="prepare"> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss500.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss422.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + <condition property="jboss.home" value="${jboss423.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + <!-- Define excludesfile --> + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${thirdparty.dir}/jdom-${cxf.jdom}.jar"/> + <pathelement location="${thirdparty.dir}/neethi-${cxf.neethi}.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/wstx-${cxf.wstx}.jar"/> + <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-cxf-client.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> + </path> + + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + + <!-- dummy targets --> + <target name="prepare-deploy" depends="prepare"/> + + <!-- ================================================================== --> + <!-- Miscellaneous --> + <!-- ================================================================== --> + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${tests.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> \ No newline at end of file Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf (from rev 6632, stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-default-deploy.conf) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf 2008-04-23 16:06:36 UTC (rev 6636) @@ -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/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-client.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 server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- + 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"/> + </patternset> + + <patternset id="jbossws.client.patternset"> + <include name="**/cxf-*.jar"/> + <include name="**/geronimo-javamail*.jar"/> + <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxws-api.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="**/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="**/stax-api.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> + </patternset> + + <patternset id="jbossws.lib.patternset"> + <include name="**/nothing-to-deploy"/> + </patternset> + + <patternset id="jbossws.lib.endorsed.patternset"> + <include name="**/jaxb-api.jar"/> + </patternset> + + <patternset id="jbossws.server.lib.patternset"> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/saaj-api.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="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> + </patternset> + + <!-- ================================================================== --> + <!-- Deploy Bin --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-bin"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.bin.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-lib42"> + <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> + + <macrodef name="macro-deploy-jbossws-lib50"> + <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"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </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-client"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Server Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-server-lib"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + <include name="**/jbossws-jboss42.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS Service --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-cxf42-sar"> + <attribute name="thirdpartydir"/> + <attribute name="resourcesdir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jbossws-deploy.conf"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf-management*.war"/> + </fileset> + </unzip> + <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf42-beans.xml"/> + </fileset> + </copy> + <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-cxf42-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; + <copy todir="@{targetdir}/META-INF"> + <fileset dir=&quot;(a){thirdpartydir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{resourcesdir}/META-INF"/> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-cxf50-sar"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jbossws-deploy.conf"/> + </fileset> + </copy> + <unzip dest=&quot;(a){targetdir}/jbossws-context.war&quot; overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf-context*.war"/> + </fileset> + </unzip> + <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf50-beans.xml"/> + </fileset> + </copy> + <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-cxf50-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; + <copy todir="@{targetdir}/META-INF"> + <fileset dir=&quot;(a){thirdpartydir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS --> + <!-- ================================================================== --> + + <!-- JDK Detection --> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> + </target> + + <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/> + </target> + + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + </target> + + <!-- ================================================================== --> + <!-- Undeploy JBossWS --> + <!-- ================================================================== --> + + <macrodef name="macro-undeploy-jbossws"> + <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.undeploy.home" value="@{targetdir}/../../../.."/> + <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/> + <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/> + + <delete> + <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/> + </delete> + <delete dir="@{targetdir}"/> + </sequential> + </macrodef> + +</project> \ No newline at end of file Added: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,34 @@ +<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>binary-distribution</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <!-- root --> + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + <includes> + <include>build.xml</include> + <include>ant.properties</include> + </includes> + </fileSet> + <!-- build --> + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>build</outputDirectory> + <filtered>true</filtered> + <includes> + <include>build-deploy.xml</include> + <include>jbossws-default-deploy.conf</include> + <include>jbossws-deploy-macros.xml</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Property changes on: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (from rev 6633, stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,98 @@ +<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>deploy-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- bin --> + <dependencySets> + <dependencySet> + <outputDirectory>bin</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>true</unpack> + <includes> + <include>*:jbossws-framework:zip:scripts</include> + </includes> + </dependencySet> + </dependencySets> + + <!-- lib --> + <moduleSets> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-client</include> + <include>org.jboss.ws:jbossws-cxf-server</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:cxf-*</include> + <include>*:geronimo-javamail*</include> + <include>*:geronimo-ws-metadata*</include> + <include>*:jaxb-api:jar</include> + <include>*:jaxb-impl:jar</include> + <include>*:jaxb-xjc:jar</include> + <include>*:jaxrpc-api:jar</include> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:jbossws-jboss42:jar</include> + <include>*:neethi:jar</include> + <include>*:saaj-api:jar</include> + <include>*:saaj-impl:jar</include> + <include>*:spring-beans:jar</include> + <include>*:spring-context:jar</include> + <include>*:spring-core:jar</include> + <include>*:stax-api:jar</include> + <include>*:wsdl4j:jar</include> + <include>*:xml-resolver:jar</include> + <include>*:XmlSchema:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>wstx.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:wstx-asl:jar</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-management</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + </binaries> + </moduleSet> + </moduleSets> + + <!-- resources --> + <fileSets> + <fileSet> + <directory>modules/server/target/resources</directory> + <outputDirectory>resources</outputDirectory> + <includes> + <include>jbossws-beans42/**</include> + <include>jbossws-cxf.sar/**</include> + <include>jbossws-jboss42.sar/**</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Deleted: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -1,205 +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>deploy-structure-jboss422</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - - <!-- bin --> - <dependencySet> - <outputDirectory>bin</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <unpack>true</unpack> - <includes> - <include>*:jbossws-framework:zip:scripts</include> - </includes> - </dependencySet> - - <!-- server/default/lib --> - <!-- - outputFileNameMapping in dependencySet uses pom's artifactid - http://jira.codehaus.org/browse/MASSEMBLY-315 - <dependencySet> - <outputDirectory>server/default/lib</outputDirectory> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <unpack>false</unpack> - <includes> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:saaj-api:jar</include> - </includes> - </dependencySet> - --> - </dependencySets> - - <moduleSets> - <!-- client --> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-client</include> - </includes> - <binaries> - <outputDirectory>client</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:cxf-*</include> - <include>*:geronimo-javamail*</include> - <include>*:geronimo-ws-metadata*</include> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxb-xjc:jar</include> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:jbossws-jboss42:jar</include> - <include>*:neethi:jar</include> - <include>*:saaj-api:jar</include> - <include>*:saaj-impl:jar</include> - <include>*:spring-beans:jar</include> - <include>*:spring-context:jar</include> - <include>*:spring-core:jar</include> - <include>*:stax-api:jar</include> - <include>*:wsdl4j:jar</include> - <include>*:xml-resolver:jar</include> - <include>*:XmlSchema:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:wstx-asl:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - - <!-- server/default/lib --> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-server</include> - </includes> - <binaries> - <outputDirectory>server/default/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <!-- - useProjectArtifact is documented but not in schema - http://jira.codehaus.org/browse/MASSEMBLY-316 - <useProjectArtifact>false</useProjectArtifact> - --> - <includes> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:jbossws-jboss42:jar</include> - <include>*:saaj-api:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - - <!-- server/default/deploy/jbossws.sar --> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-server</include> - <include>org.jboss.ws:jbossws-cxf-client</include> - </includes> - <binaries> - <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:cxf-*</include> - <include>*:geronimo-javamail*</include> - <include>*:geronimo-ws-metadata*</include> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxrpc-api*</include> - <include>*:jaxws-api*</include> - <include>*:neethi*</include> - <include>*:saaj-api*</include> - <include>*:saaj-impl*</include> - <include>*:spring-beans*</include> - <include>*:spring-context*</include> - <include>*:spring-core*</include> - <include>*:stax-api*</include> - <include>*:wsdl4j*</include> - <include>*:xml-resolver*</include> - <include>*:XmlSchema*</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:wstx-asl:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - <!-- server/default/deploy/jbossws.sar/jbossws-context.war --> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-management</include> - </includes> - <binaries> - <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <includeDependencies>false</includeDependencies> - <unpack>true</unpack> - </binaries> - </moduleSet> - </moduleSets> - <fileSets> - <!-- server/default/deploy/jbossws.sar/META-INF --> - <fileSet> - <directory>modules/server/target/resources/jbossws-cxf.sar</directory> - <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> - <includes> - <include>META-INF/**</include> - </includes> - </fileSet> - <fileSet> - <directory>modules/server/target/resources/jbossws-jboss42.sar</directory> - <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> - <includes> - <include>META-INF/**</include> - </includes> - </fileSet> - <!-- server/default/deploy/jbossws.sar/jbossws.beans --> - <fileSet> - <directory>modules/server/target/resources/jbossws-beans42</directory> - <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans</outputDirectory> - <includes> - <include>META-INF/**</include> - </includes> - </fileSet> - </fileSets> - -</assembly> \ No newline at end of file