[jbossws-commits] JBossWS SVN: r10136 - in stack/cxf/trunk: modules/management and 6 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-05-28 05:52:59 -0400 (Thu, 28 May 2009) New Revision: 10136 Added: stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.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/profiles.xml.example stack/cxf/trunk/src/main/distro/Install.txt stack/cxf/trunk/src/main/distro/ant.properties.example 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/scripts/assembly-deploy-artifacts.xml Log: adding AS 5.2.x support Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/build.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -63,6 +63,9 @@ <condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}"> <isset property="profiles.profile.properties.jboss510.home"/> </condition> + <condition property="jboss520.home" value="${profiles.profile.properties.jboss520.home}"> + <isset property="profiles.profile.properties.jboss520.home"/> + </condition> <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}"> <isset property="profiles.profile.properties.jboss600.home"/> </condition> @@ -72,12 +75,14 @@ <property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/> <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/> <property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/> + <property name="jboss520.home" value="${profiles.profile.properties.jboss520.home}"/> <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/> <echo/> <echo message="jboss500.home=${jboss500.home}"/> <echo message="jboss501.home=${jboss501.home}"/> <echo message="jboss510.home=${jboss510.home}"/> + <echo message="jboss520.home=${jboss520.home}"/> <echo message="jboss600.home=${jboss600.home}"/> </target> Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/modules/management/pom.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -39,12 +39,17 @@ <artifactId>jbossws-jboss501</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510</artifactId> + <scope>provided</scope> + </dependency> <!-- [JBWS-2505] --> <!-- START --> <!-- <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> + <artifactId>jbossws-jboss520x</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -10,8 +10,8 @@ <!-- ====================================================================== --> <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. @@ -24,7 +24,7 @@ <include name="**/wsrunclient.bat"/> <include name="**/wsrunclient.sh"/> </patternset> - + <patternset id="jbossws.client.patternset"> <include name="**/asm.jar"/> <include name="**/commons-collections.jar"/> @@ -56,15 +56,15 @@ <include name="**/XmlSchema.jar"/> <include name="**/FastInfoset.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"/> @@ -72,7 +72,7 @@ <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"/> @@ -96,11 +96,11 @@ <include name="**/XmlSchema.jar"/> <include name="**/FastInfoset.jar"/> </patternset> - + <!-- ================================================================== --> <!-- Deploy Bin --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-bin"> <attribute name="artifactsdir"/> <attribute name="targetdir"/> @@ -113,11 +113,11 @@ </copy> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy Lib --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-lib50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -148,6 +148,21 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-lib52"> + <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-impl.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <macrodef name="macro-deploy-jbossws-lib60"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -166,7 +181,7 @@ <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-endorsed"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -179,11 +194,11 @@ </copy> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy Client --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-client50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -198,7 +213,7 @@ </copy> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-client51"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -208,6 +223,21 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-client52"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> <!-- [JBWS-2505] --> <!-- START --> <!-- @@ -218,7 +248,7 @@ </copy> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-client60"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -237,12 +267,12 @@ </fileset> </copy> </sequential> - </macrodef> - + </macrodef> + <!-- ================================================================== --> <!-- Deploy Server Lib --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-server-lib50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -256,7 +286,7 @@ </copy> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-server-lib51"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -270,7 +300,21 @@ </copy> </sequential> </macrodef> - + + <macrodef name="macro-deploy-jbossws-server-lib52"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + <macrodef name="macro-deploy-jbossws-server-lib60"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -284,11 +328,11 @@ </copy> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy JUDDI Service --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-juddi-sar"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -307,11 +351,11 @@ </copy> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-cxf50-sar"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -326,7 +370,7 @@ </unzip> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-cxf51-sar"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -342,6 +386,21 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-cxf52-sar"> + <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf-management.war"/> + </fileset> + </unzip> + </sequential> + </macrodef> + <macrodef name="macro-deploy-jbossws-cxf60-sar"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -356,11 +415,11 @@ </unzip> </sequential> </macrodef> - + <!-- ================================================================== --> <!-- Deploy Deployers --> <!-- ================================================================== --> - + <macrodef name="macro-deploy-jbossws-deployers50"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -392,7 +451,7 @@ </copy> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-deployers51"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -414,6 +473,38 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <include name="**/jbossws-deployer-jboss-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-deployers52"> + <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + </fileset> + </copy> + <copy todir="@{targetdir}"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> + </fileset> + </copy> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> <!-- [JBWS-2505] --> <!-- START --> <!-- @@ -480,7 +571,7 @@ <!-- ================================================================== --> <!-- Deploy JBossWS --> <!-- ================================================================== --> - + <target name="deploy-jbossws-cxf50" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -491,7 +582,7 @@ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - + <target name="deploy-jbossws-cxf51" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -503,6 +594,17 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-cxf52" depends="check-parameters"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client52 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib52 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib52 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! --> + <macro-deploy-jbossws-cxf52-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers52 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + </target> + <target name="deploy-jbossws-cxf60" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -513,29 +615,29 @@ <macro-deploy-jbossws-deployers60 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - + <target name="check-parameters"> <fail message="installserver must be specified" unless="installserver"/> <fail message="artifactsdir must be specified" unless="artifactsdir"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> </target> - + <!-- ================================================================== --> <!-- Undeploy JBossWS --> <!-- ================================================================== --> - + <macrodef name="macro-undeploy-jbossws50"> <attribute name="defaultconf"/> <attribute name="targetdir"/> <sequential> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - + <property name="jboss.server.home" value="@{targetdir}/../.."/> <property name="jboss.home" value="${jboss.server.home}/../.."/> <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - + <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -544,33 +646,69 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> - + <!-- delete content of last deployment --> <delete> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> - + <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> - + <!-- delete juddi-service.sar --> <delete dir="@{targetdir}/../juddi-service.sar"/> - + </sequential> </macrodef> - + <macrodef name="macro-undeploy-jbossws51"> <attribute name="defaultconf"/> <attribute name="targetdir"/> <sequential> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - + <property name="jboss.server.home" value="@{targetdir}/../.."/> <property name="jboss.home" value="${jboss.server.home}/../.."/> <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - + + <!-- delete stale container integration jars --> + <delete> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + + <!-- delete content of last deployment --> + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + + <!-- delete jbossws.sar --> + <delete dir="@{targetdir}"/> + + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-jbossws52"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> @@ -585,18 +723,18 @@ </delete> --> <!-- END --> - + <!-- delete content of last deployment --> <delete> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> - + <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> - + <!-- delete juddi-service.sar --> <delete dir="@{targetdir}/../juddi-service.sar"/> - + </sequential> </macrodef> @@ -606,12 +744,12 @@ <sequential> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - + <property name="jboss.server.home" value="@{targetdir}/../.."/> <property name="jboss.home" value="${jboss.server.home}/../.."/> <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - + <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> @@ -626,19 +764,19 @@ </delete> --> <!-- END --> - + <!-- delete content of last deployment --> <delete> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> - + <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> - + <!-- delete juddi-service.sar --> <delete dir="@{targetdir}/../juddi-service.sar"/> - + </sequential> </macrodef> - + </project> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/modules/server/pom.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -206,16 +206,24 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510</artifactId> + <version>${jbossws.jboss510.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> + </artifactItem> <!-- JBWS-2505 --> <!-- START --> <!-- <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> - <version>${jbossws.jboss510.version}</version> + <artifactId>jbossws-jboss520x</artifactId> + <version>${jbossws.jboss520.version}</version> <classifier>resources</classifier> <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss520</outputDirectory> </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> 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 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -57,6 +57,16 @@ &lt;/deployment&gt; </footer> </concat> + <!-- Concat jbossws-jboss520/jbossws.beans --> + <echo message="Concat jbossws-jboss520/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss520/jbossws.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> + <!-- Concat jbossws-jboss600/jbossws.beans --> <echo message="Concat jbossws-jboss600/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml"> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -398,16 +398,61 @@ <profile> <id>jboss510</id> <properties> - <jboss.version>5.1.0-SNAPSHOT</jboss.version> + <jboss.version>5.1.0.GA</jboss.version> <jbossws.integration.target>jboss510</jbossws.integration.target> </properties> <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-security</artifactId> + <version>${jboss.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: jboss520 + Descr: JBoss-5.2.0 specific options + --> + <profile> + <id>jboss520</id> + <properties> + <jboss.version>5.2.0-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss520</jbossws.integration.target> + </properties> + <dependencies> <!-- [JBWS-2505] --> <!-- START --> <!-- <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> + <artifactId>jbossws-jboss520x</artifactId> </dependency> --> <dependency> @@ -433,13 +478,13 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss520.txt</testExcludeFile> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss520.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> Added: stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-05-28 09:52:59 UTC (rev 10136) @@ -0,0 +1,61 @@ +# UsernameTestCase requires trustore in jboss-web tomcat configuration +org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** + +# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [CXF-1516] Type inheritance with document/literal/bare +org/jboss/test/ws/jaxws/jbws1702/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-2006] RespectBinding feature and not understood required extensibility elements +org/jboss/test/ws/jaxws/jbws2449/** + +# [CXF-2185] Handler protocol match fails when multiple protocols are specified +org/jboss/test/ws/jaxws/handlerscope/** + +# [CXF-2190] Invalid message sent using Dispatch +org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.* + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* + +# [JBWS-1655] Add support for endpoint address rewriting +org/jboss/test/ws/jaxws/jbws2150/** + +# [JBWS-2596] Resource injection in jaxws endpoints and handlers +org/jboss/test/ws/jaxws/jbws2074/** +org/jboss/test/ws/jaxws/jbws2634/** + +# [JBWS-2561] XOP request not properly inlined +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* + +# [JBWS-2571] Mode.INOUT parameter not generated +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-2480] Soap attachments are dropped on server response +org/jboss/test/ws/jaxws/jbws1283/** + +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** Property changes on: stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt ___________________________________________________________________ Name: svn:executable + * Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/pom.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -48,11 +48,12 @@ <jbossws.spi.version>1.2.0-SNAPSHOT</jbossws.spi.version> <jbossws.jboss500.version>3.2.0-SNAPSHOT</jbossws.jboss500.version> <jbossws.jboss501.version>3.2.0-SNAPSHOT</jbossws.jboss501.version> + <jbossws.jboss510.version>3.2.0-SNAPSHOT</jbossws.jboss510.version> <!-- JBWS-2505 --> <!-- START --> <!-- - <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version> - <jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version> + <jbossws.jboss520.version>3.2.0-SNAPSHOT</jbossws.jboss520.version> + <jbossws.jboss600.version>3.2.0-SNAPSHOT</jbossws.jboss600.version> --> <!-- END --> <cxf.version>2.2.2-SNAPSHOT</cxf.version> @@ -128,18 +129,30 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510</artifactId> + <version>${jbossws.jboss510.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510</artifactId> + <version>${jbossws.jboss510.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> <!-- JBWS-2505 --> <!-- START --> <!-- <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> - <version>${jbossws.jboss510.version}</version> + <artifactId>jbossws-jboss520x</artifactId> + <version>${jbossws.jboss520.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> - <version>${jbossws.jboss510.version}</version> + <artifactId>jbossws-jboss520x</artifactId> + <version>${jbossws.jboss520.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> @@ -559,6 +572,18 @@ </profile> <!-- + Name: jboss520 + Descr: JBoss-5.2.0 specific options + --> + <profile> + <id>jboss520</id> + <properties> + <jbossws.integration.target>jboss520</jbossws.integration.target> + <jboss.home>${jboss520.home}</jboss.home> + </properties> + </profile> + + <!-- Name: jboss600 Descr: JBoss-6.0.0 specific options --> Modified: stack/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/profiles.xml.example 2009-05-28 09:52:59 UTC (rev 10136) @@ -1,7 +1,7 @@ <profilesXml 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/profiles-1.0.0.xsd"> <profiles> - + <!-- This profile can also be defined in ~/.m2/settings.xml --> <profile> <id>jboss-home-profile</id> @@ -12,11 +12,12 @@ </activation> <properties> <jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> - <jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home> - <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.GA</jboss510.home> + <jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home> + <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home> + <jboss520.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.2.0.Beta</jboss520.home> <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home> </properties> </profile> - + </profiles> </profilesXml> Modified: stack/cxf/trunk/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/src/main/distro/Install.txt 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/src/main/distro/Install.txt 2009-05-28 09:52:59 UTC (rev 10136) @@ -13,9 +13,11 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss50x - ant deploy-jboss51x - ant deploy-jboss60x + ant deploy-jboss500 + ant deploy-jboss501 + ant deploy-jboss510 + ant deploy-jboss520 + ant deploy-jboss600 4.) Execute the samples to verify your installation Modified: stack/cxf/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-05-28 09:52:59 UTC (rev 10136) @@ -6,10 +6,11 @@ jboss500.home=(a)jboss500.home@ jboss501.home=(a)jboss501.home@ jboss510.home=(a)jboss510.home@ +jboss520.home=(a)jboss520.home@ jboss600.home=(a)jboss600.home@ -# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600] -jbossws.integration.target=jboss500 +# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss520|jboss600] +jbossws.integration.target=jboss510 # The JBoss settings jboss.server.instance=default Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -108,6 +108,43 @@ </target> <!-- ================================================================== --> + <!-- Prepare Deployment Structure JBoss-5.2.x --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss52" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-cxf52" 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}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure}"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss520 --> + <!-- ================================================================== --> + + <target name="target-jboss520"> + <property name="jbossws.integration.target" value="jboss520"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss520" depends="undeploy-jboss520,deploy-structure-jboss52" description="Deploy jbossws to jboss520"> + <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/> + <copy todir="${jboss520.home}" overwrite="true"> + <fileset dir="${deploy.structure}"/> + </copy> + <chmod dir="${jboss520.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520"> + <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/> + <macro-undeploy-jbossws52 targetdir="${jboss520.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-6.0.x --> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -42,6 +42,13 @@ <property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/> <property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/> + <property name="jboss520.lib" value="${jboss520.home}/lib"/> + <property name="jboss520.client" value="${jboss520.home}/client"/> + <property name="jboss520.server" value="${jboss520.home}/server/${jboss.server.instance}"/> + <property name="jboss520.server.lib" value="${jboss520.home}/common/lib"/> + <property name="jboss520.server.deploy" value="${jboss520.server}/deploy"/> + <property name="jboss520.server.deployers" value="${jboss520.server}/deployers"/> + <property name="jboss600.lib" value="${jboss600.home}/lib"/> <property name="jboss600.client" value="${jboss600.home}/client"/> <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/> @@ -52,11 +59,13 @@ <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> <property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/> + <property name="jboss520.available.file" value="${jboss520.client}/jboss-client.jar"/> <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> <available property="jboss500.available" file="${jboss500.available.file}"/> <available property="jboss501.available" file="${jboss501.available.file}"/> <available property="jboss510.available" file="${jboss510.available.file}"/> + <available property="jboss520.available" file="${jboss520.available.file}"/> <available property="jboss600.available" file="${jboss600.available.file}"/> <tstamp> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/src/main/distro/build.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -56,6 +56,11 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss510"/> </or> </condition> + <condition property="jbossws.integration.jboss52" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss520"/> + </or> + </condition> <condition property="jbossws.integration.jboss60" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-05-28 09:30:10 UTC (rev 10135) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-05-28 09:52:59 UTC (rev 10136) @@ -108,17 +108,27 @@ <include>org.jboss.ws:jbossws-jboss501:jar</include> </includes> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss510:jar</include> + </includes> + </dependencySet> <!-- [JBWS-2505] --> <!-- START --> <!-- <dependencySet> <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss520.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss510x:jar</include> + <include>org.jboss.ws:jbossws-jboss520x:jar</include> </includes> </dependencySet> <dependencySet>