[jbossws-commits] JBossWS SVN: r6665 - in stack/cxf/trunk: modules/server and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 11:09:16 -0400 (Thu, 24 Apr 2008) New Revision: 6665 Modified: stack/cxf/trunk/.classpath stack/cxf/trunk/ant.properties.example stack/cxf/trunk/build.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build-setup.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: jboss422 ok Modified: stack/cxf/trunk/.classpath =================================================================== --- stack/cxf/trunk/.classpath 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/.classpath 2008-04-24 15:09:16 UTC (rev 6665) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/server/src/main/java"/> - <classpathentry kind="src" path="modules/testsuite/framework-tests/src/test/java"/> - <classpathentry kind="src" path="modules/testsuite/cxf-tests/src/test/java"/> <classpathentry kind="src" path="modules/client/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> Modified: stack/cxf/trunk/ant.properties.example =================================================================== --- stack/cxf/trunk/ant.properties.example 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/ant.properties.example 2008-04-24 15:09:16 UTC (rev 6665) @@ -9,9 +9,6 @@ #jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4 #jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1 -# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] -jbossws.integration.target=jboss422 - # The JBoss settings jboss.server.instance=default Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/build.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -13,11 +13,6 @@ <project basedir="." name="JBossWS-CXF"> - <!-- Load ant.properties --> - <available property="ant.properties.available" file="${basedir}/ant.properties"/> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${basedir}/ant.properties"/> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> @@ -31,8 +26,6 @@ <property name="stack.server.dir" value="${stack.modules.dir}/server"/> <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> - <property name="deploy.structure.jboss42" value="${stack.output.dir}/deploy-jboss422"/> - <property name="deploy.structure.jboss50" value="${stack.output.dir}/deploy-jboss500"/> <import file="${stack.distro.dir}/build-setup.xml"/> <import file="${stack.distro.dir}/build-deploy.xml"/> @@ -81,7 +74,7 @@ </exec> </target> - <target name="clean" depends="prepare" description="Cleans up most generated files."> + <target name="clean" description="Cleans up most generated files."> <echo message="*************************************"/> <echo message="* mvn clean *"/> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/modules/server/pom.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -37,10 +37,18 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> + <artifactId>jbossws-jboss422</artifactId> + <version>${jbossws.jboss422.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + <version>${jbossws.jboss423.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> <!-- CXF dependencies --> <dependency> @@ -129,17 +137,25 @@ <goal>unpack</goal> </goals> <configuration> - <artifactItems>org.jboss.ws:jbossws-jboss42:zip:resources</artifactItems> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - <version>${jbossws.jboss42.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources</outputDirectory> - </artifactItem> - </artifactItems> + <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss422</artifactId> + <version>${jbossws.jboss422.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss422</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + <version>${jbossws.jboss423.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory> + </artifactItem> + </artifactItems> </configuration> </execution> </executions> @@ -155,6 +171,8 @@ </goals> <configuration> <tasks> + <property name="jbossws.jboss422.version" value="${jbossws.jboss422.version}"/> + <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/> <ant antfile="src/main/scripts/antrun-beans-config.xml"/> </tasks> </configuration> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -29,28 +29,40 @@ <!-- Compile resource files --> <target name="main" depends="init"> - <!-- concat jbossws-cxf50-beans.xml --> - <echo message="Concat jbossws-cxf50-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-beans50/META-INF/jboss-beans.xml"> + <!-- Concat jbossws-jboss422/jbossws.beans --> + <echo message="Concat jbossws-jboss422/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss422/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"&gt; </header> <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> - <!-- Concat jbossws-cxf42-beans.xml --> - <echo message="Concat jbossws-cxf42-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-beans42/META-INF/jboss-beans.xml"> + <!-- Concat jbossws-jboss423/jbossws.beans --> + <echo message="Concat jbossws-jboss423/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; </header> <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/> + <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> + <!-- Concat jbossws-jboss500-beans/META-INF/jboss-beans.xml - -> + <echo message="Concat jbossws-jboss500-beans/META-INF/jboss-beans.xml"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss500-beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat--> + </target> </project> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -163,7 +163,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> + <artifactId>jbossws-jboss422</artifactId> </dependency> </dependencies> <build> @@ -178,7 +178,41 @@ </build> </profile> + <!-- + Name: jboss423 + Descr: JBoss-4.2.3 specific options + --> + <profile> + <id>jboss423</id> + <properties> + <jboss.version>4.2.3.GA</jboss.version> + <jbossws.integration.target>jboss423</jbossws.integration.target> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jbossall-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/pom.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -118,7 +118,8 @@ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>${version}</jbossws.framework.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> - <jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version> + <jbossws.jboss422.version>3.0.0-SNAPSHOT</jbossws.jboss422.version> + <jbossws.jboss423.version>3.0.0-SNAPSHOT</jbossws.jboss423.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> @@ -164,16 +165,28 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - <version>${jbossws.jboss42.version}</version> + <artifactId>jbossws-jboss422</artifactId> + <version>${jbossws.jboss422.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - <version>${jbossws.jboss42.version}</version> + <artifactId>jbossws-jboss422</artifactId> + <version>${jbossws.jboss422.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + <version>${jbossws.jboss423.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + <version>${jbossws.jboss423.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> <!-- provided apis --> <dependency> @@ -294,8 +307,24 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> + <artifactId>jbossws-jboss422</artifactId> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss422</artifactId> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss423</artifactId> + <classifier>resources</classifier> + <type>zip</type> + </dependency> </dependencies> <!-- Plugins --> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -18,61 +18,88 @@ <!-- ================================================================== --> <target name="deploy-structure-jboss42" depends="prepare-deploy"> - <delete dir="${deploy.structure.jboss42}"/> + <delete dir="${deploy.structure}"/> <antcall target="deploy-jbossws-cxf42" inheritall="false"> - <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> <!-- ================================================================== --> <!-- Deployment JBoss422 --> <!-- ================================================================== --> + <target name="target-jboss422"> + <property name="jbossws.integration.target" value="jboss422"/> + </target> + <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}"/> + <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> + <target name="undeploy-jboss422" depends="target-jboss422, 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"> + <target name="target-jboss423"> + <property name="jbossws.integration.target" value="jboss423"/> + </target> + + <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" 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}"/> + <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> + <target name="undeploy-jboss423" depends="target-jboss423, 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> <!-- ================================================================== --> + <!-- Prepare Deployment Structure JBoss-4.2.x --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss50" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-cxf50" inheritall="false"> + <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> + </target> + + <!-- ================================================================== --> <!-- Deployment JBoss500 --> <!-- ================================================================== --> - <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws to jboss500"> + <target name="target-jboss500"> + <property name="jbossws.integration.target" value="jboss500"/> + </target> + + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" 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}"/> + <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> + <target name="undeploy-jboss500" depends="target-jboss500, 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> @@ -81,15 +108,19 @@ <!-- Deployment JBoss501 --> <!-- ================================================================== --> - <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws to jboss501"> + <target name="target-jboss501"> + <property name="jbossws.integration.target" value="jboss501"/> + </target> + + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" 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}"/> + <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> </target> - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <target name="undeploy-jboss501" depends="target-jboss501, 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> Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -20,7 +20,6 @@ <!-- Check if ant.properties is available --> <available property="ant.properties.available" file="${basedir}/ant.properties"/> <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${basedir}/ant.properties"/> <property name="jboss422.lib" value="${jboss422.home}/lib"/> @@ -59,24 +58,29 @@ <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> - <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> <target name="prepare"> + + <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> + + <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> + + <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/> + <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -29,8 +29,6 @@ <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-jboss422"/> - <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss500"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> <import file="${build.dir}/build-setup.xml"/> Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -179,12 +179,13 @@ <macrodef name="macro-deploy-jbossws-server-lib"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> - <include name="**/jbossws-jboss42.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy> </sequential> @@ -197,6 +198,7 @@ <macrodef name="macro-deploy-jbossws-cxf42-sar"> <attribute name="artifactsdir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> @@ -214,7 +216,7 @@ </fileset> </unzip> <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; - <fileset dir="@{artifactsdir}/resources/jbossws-beans42"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; <include name="META-INF/**"/> </fileset> </copy> @@ -222,7 +224,7 @@ <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; </copy> <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-jboss42.sar/META-INF&quot;/&gt; + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; </copy> </sequential> </macrodef> @@ -266,16 +268,16 @@ <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}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> </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}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-24 14:40:48 UTC (rev 6664) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-24 15:09:16 UTC (rev 6665) @@ -26,7 +26,8 @@ <useStrictFiltering>true</useStrictFiltering> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss42:jar</include> + <include>*:jbossws-jboss422:jar:*</include> + <include>*:jbossws-jboss423:jar:*</include> </includes> </dependencySet> </dependencySets> @@ -99,9 +100,7 @@ <directory>modules/server/target/resources</directory> <outputDirectory>resources</outputDirectory> <includes> - <include>jbossws-beans42/**</include> - <include>jbossws-cxf.sar/**</include> - <include>jbossws-jboss42.sar/**</include> + <include>jbossws-*/**</include> </includes> </fileSet> </fileSets>