[jbossws-commits] JBossWS SVN: r9291 - in stack/cxf/trunk: modules/management and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Feb 13 06:33:19 EST 2009
Author: richard.opalka at jboss.com
Date: 2009-02-13 06:33:19 -0500 (Fri, 13 Feb 2009)
New Revision: 9291
Added:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.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/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:
[JBWS-2505] don't deploy AS integration layer
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/build.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -10,7 +10,7 @@
<!-- ====================================================================== -->
<project basedir="." name="JBossWS-CXF">
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
@@ -24,19 +24,19 @@
<property name="stack.server.dir" value="${stack.modules.dir}/server"/>
<property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/>
<property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/>
-
+
<import file="${stack.distro.dir}/build-setup.xml"/>
<import file="${stack.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
-
+
<property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/>
<property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="os-init">
<condition property="ext" value=".bat">
<not>
@@ -67,46 +67,51 @@
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
+ <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
+ <isset property="profiles.profile.properties.jboss501.home"/>
+ </condition>
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
-
+
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
<property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/>
<property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
<property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/>
<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="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
-
+
<echo/>
<echo message="jboss422.home=${jboss422.home}"/>
<echo message="jboss423.home=${jboss423.home}"/>
<echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
+ <echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
</target>
-
+
<target name="init" depends="mvn-settings,prepare,os-init">
<xmlproperty file="${stack.dir}/pom.xml"/>
<property name="version.id" value="${project.version}"/>
-
+
<echo message="version.id=${version.id}"/>
<echo message="integration.target=${jbossws.integration.target}"/>
-
+
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Distribution -->
<!-- ================================================================== -->
-
+
<target name="prepare-deploy" depends="prepare,os-init">
<!-- Use a system property to overwrite the empty default value -->
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -50,10 +50,16 @@
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<scope>runtime</scope>
</dependency>
@@ -62,6 +68,7 @@
<artifactId>jbossws-jboss600x</artifactId>
<scope>runtime</scope>
</dependency>
+ -->
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
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-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -141,7 +141,7 @@
</copy>
</sequential>
</macrodef>
-
+
<macrodef name="macro-deploy-jbossws-lib51">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -222,6 +222,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-client500">
+ <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"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-client50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -231,9 +246,11 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
@@ -249,9 +266,11 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
@@ -267,9 +286,11 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
@@ -448,6 +469,38 @@
<!-- Deploy Deployers -->
<!-- ================================================================== -->
+ <macrodef name="macro-deploy-jbossws-deployers500">
+ <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="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
+ <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"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </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-deployers50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -469,19 +522,23 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ -->
<!-- END -->
</sequential>
</macrodef>
@@ -507,19 +564,23 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ -->
<!-- END -->
</sequential>
</macrodef>
@@ -545,19 +606,23 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ -->
<!-- END -->
</sequential>
</macrodef>
@@ -576,6 +641,17 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="deploy-jbossws-cxf500" depends="check-parameters">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client500 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers500 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-cxf50" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -655,6 +731,41 @@
</sequential>
</macrodef>
+ <macrodef name="macro-undeploy-jbossws500">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" 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"/>
+ </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-jbossws50">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
@@ -667,9 +778,10 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
+ <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -678,6 +790,7 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
+ -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -706,9 +819,10 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
+ <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -717,6 +831,7 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
+ -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -745,9 +860,10 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
+ <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -756,6 +872,7 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
+ -->
<!-- END -->
<!-- delete content of last deployment -->
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -241,10 +241,19 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
</artifactItem>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
@@ -259,6 +268,7 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
+ -->
<!-- END -->
</artifactItems>
</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 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -73,6 +73,16 @@
</deployment> </footer>
</concat>
+ <!-- Concat jbossws-jboss501/jbossws.beans -->
+ <echo message="Concat jbossws-jboss501/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
<!-- Concat jbossws-jboss510/jbossws.beans -->
<echo message="Concat jbossws-jboss510/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -1,11 +1,11 @@
<project 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack CXF Testsuite</name>
<artifactId>jbossws-cxf-testsuite</artifactId>
<packaging>pom</packaging>
-
+
<!-- Parent -->
<parent>
<groupId>org.jboss.ws.cxf</groupId>
@@ -13,7 +13,7 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<!-- Properties -->
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
@@ -25,15 +25,16 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<asm.version>2.2.3</asm.version>
+ <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
</properties>
-
+
<!-- Modules -->
<modules>
<module>cxf-tests</module>
<module>framework-tests</module>
</modules>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -92,7 +93,7 @@
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
-
+
<!-- Build -->
<build>
<testResources>
@@ -225,13 +226,13 @@
</plugin>
</plugins>
</build>
-
+
<!-- Profiles -->
<profiles>
-
- <!--
+
+ <!--
Name: debug
- Descr: Enable remote debuging for tests
+ Descr: Enable remote debuging for tests
-->
<profile>
<id>debug</id>
@@ -255,8 +256,8 @@
<surefire.jvm.args>${surefire.security.args} ${surefire.memory.args}</surefire.jvm.args>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: hudson
Descr: Ignore test failures on hudson
-->
@@ -273,17 +274,16 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss422
- Descr: JBoss-4.2.2 specific options
+ Descr: JBoss-4.2.2 specific options
-->
<profile>
<id>jboss422</id>
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -314,17 +314,16 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss423
- Descr: JBoss-4.2.3 specific options
+ 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>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -355,17 +354,16 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss424
- Descr: JBoss-4.2.4 specific options
+ Descr: JBoss-4.2.4 specific options
-->
<profile>
<id>jboss424</id>
<properties>
<jboss.version>4.2.4-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss424</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
<dependency>
@@ -396,30 +394,85 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss500
- Descr: JBoss-5.0.0 specific options
+ Descr: JBoss-5.0.0 specific options
-->
<profile>
<id>jboss500</id>
<properties>
<jboss.version>5.0.0.GA</jboss.version>
<jbossws.integration.target>jboss500</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
- <!-- [JBWS-2263] -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>${jboss.javaee.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <!-- TODO: replace with maven dependencies -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <properties>
+ <jboss.version>5.0.1-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss501</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
<!--dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ </dependency-->
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
- </dependency-->
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -444,13 +497,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
@@ -461,30 +514,29 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss510
- Descr: JBoss-5.1.0 specific options
+ Descr: JBoss-5.1.0 specific options
-->
<profile>
<id>jboss510</id>
<properties>
<jboss.version>5.1.0-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss510</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
- <dependency>
+ <!--dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
- </dependency>
- <!--dependency>
+ </dependency-->
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
- </dependency-->
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -527,29 +579,28 @@
</build>
</profile>
- <!--
+ <!--
Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
<id>jboss600</id>
<properties>
<jboss.version>6.0.0-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss600</jbossws.integration.target>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
</properties>
<dependencies>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
- <dependency>
+ <!--dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- </dependency>
- <!--dependency>
+ </dependency-->
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
- </dependency-->
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -630,5 +681,5 @@
</properties>
</profile>
</profiles>
-
+
</project>
Added: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt (rev 0)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-02-13 11:33:19 UTC (rev 9291)
@@ -0,0 +1,77 @@
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+
+# TODO: Fix classpath to ClientLauncher
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
+org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
+
+# [CXF-1253] CXF does not respect @HandlerChain on client SEI
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+
+# [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-1513] NPE in JaxWsServiceConfiguration
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws1694/**
+org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2247][CXF-1514] 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/wrapped
+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-1520] MTOM chunked encoding transfer
+org/jboss/test/ws/jaxws/jbws2000/**
+
+# [CXF-1521] Exception handling with @WebFault annotation
+org/jboss/test/ws/jaxws/webfault/**
+
+# [CXF-1624] XmlSchemaException: Schema name conflict in collection
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
+# [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-2115] EJB client vehicle not sufficiently isolated
+org/jboss/test/ws/jaxws/jbws1581/**
+
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-2223] wsconsume for cxf build
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2330] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
+org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-2478] Investigate why WS-Security CXF tests are failing
+org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.*
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
Property changes on: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/pom.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -51,10 +51,13 @@
<jbossws.jboss423.version>3.1.0-SNAPSHOT</jbossws.jboss423.version>
<jbossws.jboss424.version>3.1.0-SNAPSHOT</jbossws.jboss424.version>
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
+ <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
+ -->
<!-- END -->
<cxf.version>2.1.4</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
@@ -151,10 +154,23 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<version>${jbossws.jboss510.version}</version>
</dependency>
@@ -177,8 +193,9 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ -->
<!-- END -->
-
+
<!-- provided apis -->
<dependency>
<groupId>javax.ejb</groupId>
@@ -525,10 +542,10 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss422
- Descr: JBoss-4.2.2 specific options
+ Descr: JBoss-4.2.2 specific options
-->
<profile>
<id>jboss422</id>
@@ -537,10 +554,10 @@
<jboss.home>${jboss422.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: jboss423
- Descr: JBoss-4.2.2 specific options
+ Descr: JBoss-4.2.2 specific options
-->
<profile>
<id>jboss423</id>
@@ -549,10 +566,10 @@
<jboss.home>${jboss423.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: jboss424
- Descr: JBoss-4.2.4 specific options
+ Descr: JBoss-4.2.4 specific options
-->
<profile>
<id>jboss424</id>
@@ -561,10 +578,10 @@
<jboss.home>${jboss424.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: jboss500
- Descr: JBoss-5.0.0 specific options
+ Descr: JBoss-5.0.0 specific options
-->
<profile>
<id>jboss500</id>
@@ -573,10 +590,22 @@
<jboss.home>${jboss500.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <properties>
+ <jbossws.integration.target>jboss501</jbossws.integration.target>
+ <jboss.home>${jboss501.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: jboss510
- Descr: JBoss-5.1.0 specific options
+ Descr: JBoss-5.1.0 specific options
-->
<profile>
<id>jboss510</id>
@@ -585,10 +614,10 @@
<jboss.home>${jboss510.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
<id>jboss600</id>
@@ -597,10 +626,10 @@
<jboss.home>${jboss600.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: smoketest
- Descr: Executes the smoke tests
+ Descr: Executes the smoke tests
-->
<profile>
<id>smoketest</id>
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/profiles.xml.example 2009-02-13 11:33:19 UTC (rev 9291)
@@ -11,12 +11,13 @@
</property>
</activation>
<properties>
- <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
- <jboss510.home>/home/tdiesler/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
- <jboss600.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
+ <jboss422.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
+ <jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
+ <jboss424.home>/home/opalka/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
+ <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.Beta1</jboss510.home>
+ <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/cxf/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-02-13 11:33:19 UTC (rev 9291)
@@ -7,10 +7,11 @@
jboss423.home=@jboss423.home@
jboss424.home=@jboss424.home@
jboss500.home=@jboss500.home@
+jboss501.home=@jboss501.home@
jboss510.home=@jboss510.home@
jboss600.home=@jboss600.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -96,6 +96,17 @@
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
+ <target name="deploy-structure-jboss500" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-cxf500" 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>
+
<target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf50" inheritall="false">
@@ -116,7 +127,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-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}"/>
@@ -126,10 +137,32 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws500 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss501">
+ <property name="jbossws.integration.target" value="jboss501"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </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}"/>
+ </copy>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.1.x -->
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-setup.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/src/main/distro/build-setup.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -46,14 +46,21 @@
<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.home}/common/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
+
<property name="jboss510.lib" value="${jboss510.home}/lib"/>
<property name="jboss510.client" value="${jboss510.home}/client"/>
<property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/>
<property name="jboss510.server.lib" value="${jboss510.home}/common/lib"/>
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/>
-
- <property name="jboss600.lib" value="${jboss600.home}/lib"/>
+
+ <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}"/>
<property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/>
@@ -64,6 +71,7 @@
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss424.available.file" value="${jboss424.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"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
@@ -71,6 +79,7 @@
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss424.available" file="${jboss424.available.file}"/>
<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="jboss600.available" file="${jboss600.available.file}"/>
Modified: stack/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/src/main/distro/build.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -56,6 +56,7 @@
<condition property="jbossws.integration.jboss50" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</or>
</condition>
<condition property="jbossws.integration.jboss51" value="true">
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 06:32:11 UTC (rev 9290)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 11:33:19 UTC (rev 9291)
@@ -109,10 +109,21 @@
<include>org.jboss.ws:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>runtime</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss501x:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
@@ -131,6 +142,7 @@
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
+ -->
<!-- END -->
</dependencySets>
</binaries>
More information about the jbossws-commits
mailing list