Author: richard.opalka(a)jboss.com
Date: 2008-07-24 07:21:27 -0400 (Thu, 24 Jul 2008)
New Revision: 7905
Added:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/management/pom.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
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 support for AS 4.2.4
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/build.xml 2008-07-24 11:21:27 UTC (rev 7905)
@@ -46,15 +46,15 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml"
keeproot="false"/>
- <condition property="jboss421.home"
value="${profiles.profile.properties.jboss421.home}">
- <isset property="profiles.profile.properties.jboss421.home"/>
- </condition>
<condition property="jboss422.home"
value="${profiles.profile.properties.jboss422.home}">
<isset property="profiles.profile.properties.jboss422.home"/>
</condition>
<condition property="jboss423.home"
value="${profiles.profile.properties.jboss423.home}">
<isset property="profiles.profile.properties.jboss423.home"/>
</condition>
+ <condition property="jboss424.home"
value="${profiles.profile.properties.jboss424.home}">
+ <isset property="profiles.profile.properties.jboss424.home"/>
+ </condition>
<condition property="jboss500.home"
value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
@@ -64,16 +64,16 @@
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml"
keeproot="false"/>
- <property name="jboss421.home"
value="${profiles.profile.properties.jboss421.home}"/>
<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}"/>
<echo/>
- <echo message="jboss421.home=${jboss421.home}"/>
<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}"/>
</target>
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/modules/management/pom.xml 2008-07-24 11:21:27 UTC (rev 7905)
@@ -37,9 +37,14 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss424x</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- [JBWS-2263] -->
<!--dependency>
<groupId>org.jboss.ws</groupId>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/modules/server/pom.xml 2008-07-24 11:21:27 UTC (rev 7905)
@@ -39,11 +39,18 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss424x</artifactId>
+ <version>${jbossws.jboss424.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
@@ -168,7 +175,7 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
<classifier>resources</classifier>
<type>zip</type>
@@ -176,6 +183,14 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss424x</artifactId>
+ <version>${jbossws.jboss424.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+
<outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR1</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
@@ -208,6 +223,7 @@
<tasks>
<property name="jbossws.jboss422.version"
value="${jbossws.jboss422.version}"/>
<property name="jbossws.jboss423.version"
value="${jbossws.jboss423.version}"/>
+ <property name="jbossws.jboss424.version"
value="${jbossws.jboss424.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-07-24
10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-07-24
11:21:27 UTC (rev 7905)
@@ -53,6 +53,18 @@
</deployment> </footer>
</concat>
+ <!-- Concat jbossws-jboss424/jbossws.beans -->
+ <echo message="Concat jbossws-jboss424/jbossws.beans"/>
+ <concat
destfile="${project.build.resources.directory}/jbossws-jboss424/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <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"> </header>
+ <fileset
file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <fileset
file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat
destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-07-24 11:21:27 UTC (rev 7905)
@@ -288,7 +288,7 @@
<profile>
<id>jboss423</id>
<properties>
- <jboss.version>4.2.3-SNAPSHOT</jboss.version>
+ <jboss.version>4.2.3.GA</jboss.version>
<jbossws.integration.target>jboss423</jbossws.integration.target>
</properties>
<dependencies>
@@ -299,7 +299,7 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
</dependency>
</dependencies>
<build>
@@ -322,6 +322,46 @@
</profile>
<!--
+ Name: jboss424
+ 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>
+ </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-jboss424x</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!--
http://jira.codehaus.org/browse/MCOMPILER-72 -->
+
<testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args}
-Djava.endorsed.dirs=${jboss424.home}/lib/endorsed</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Added: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
(rev 0)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-07-24 11:21:27 UTC
(rev 7905)
@@ -0,0 +1,110 @@
+#
+# $Id: test-excludes-jboss424.txt 7837 2008-07-16 17:21:34Z darran.lofthouse(a)jboss.com $
+#
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+
+# [CXF-1244] Application Exception not initialized properly
+org/jboss/test/ws/jaxws/samples/exception/**
+
+# [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-1261] Handler does not see XOP message properly
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+
+# [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/**
+org/jboss/test/ws/jaxws/namespace/**
+
+# [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-1515] Bad Enumeration value 'extension restriction'
+org/jboss/test/ws/jaxws/jbws1505/**
+
+# [CXF-1516] Type inheritance with document/literal/wrapped
+org/jboss/test/ws/jaxws/jbws1702/**
+org/jboss/test/ws/jaxws/jbws1733/**
+
+# [CXF-1517] HTTP bindings for Provider
+org/jboss/test/ws/jaxws/jbws1807/**
+
+# [CXF-1518] Missing fault detail in messages from SLSB Provider
+org/jboss/test/ws/jaxws/jbws1815/**
+
+# [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-1522] NPE in ServiceUtils
+org/jboss/test/ws/jaxws/jbws1566/**
+
+# [CXF-1623] Wrong AnnotationHandlerChainBuilder.protocolMatches() method implementation
or preconditions
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+
+# [CXF-1624] XmlSchemaException: Schema name conflict in collection
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+
+# [JBWS-1683] Fix JAXR samples for CXF
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1774] Provide tools implementation for CXF
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/smoke/tools/**
+
+# [JBWS-2112] Cannot use CXF with endpoint API
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [JBWS-2114] IllegalArgumentException: Wrong target. class
+org/jboss/test/ws/jaxws/jbws1283/**
+org/jboss/test/ws/jaxws/jbws1822/**
+
+# [JBWS-2115] EJB client vehicle not sufficiently isolated
+org/jboss/test/ws/jaxws/jbws1581/**
+
+# [JBWS-2117] web.xml modified to
web.xml.org - Subsequent runs fail
+org/jboss/test/ws/jaxws/jbws1762/**
+
+# [JBWS-2118] context-root in jboss.xml is ignored
+org/jboss/test/ws/jaxws/jbws1813/**
+
+# [JBWS-2119] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/jaxws/jbws1841/**
+
+# [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-2227] Investigate why multiple virtual hosts test fails on CXF
+org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/pom.xml 2008-07-24 11:21:27 UTC (rev 7905)
@@ -51,6 +51,7 @@
<jbossws.spi.version>1.0.5-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version>
+ <jbossws.jboss424.version>3.0.3-SNAPSHOT</jbossws.jboss424.version>
<jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version>
<cxf.version>2.1</cxf.version>
@@ -108,18 +109,30 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss424x</artifactId>
+ <version>${jbossws.jboss424.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss424x</artifactId>
+ <version>${jbossws.jboss424.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR1</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
@@ -429,6 +442,18 @@
</profile>
<!--
+ Name: jboss424
+ Descr: JBoss-4.2.4 specific options
+ -->
+ <profile>
+ <id>jboss424</id>
+ <properties>
+ <jbossws.integration.target>jboss424</jbossws.integration.target>
+ <jboss.home>${jboss424.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/profiles.xml.example 2008-07-24 11:21:27 UTC (rev 7905)
@@ -11,13 +11,13 @@
</property>
</activation>
<properties>
-
<jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<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_CR1/build/output/jboss-5.0.0.CR1</jboss500.home>
<jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home>
</properties>
</profile>
</profiles>
-</profilesXml>
\ No newline at end of file
+</profilesXml>
Modified: stack/cxf/trunk/src/main/distro/ant.properties
===================================================================
--- stack/cxf/trunk/src/main/distro/ant.properties 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/src/main/distro/ant.properties 2008-07-24 11:21:27 UTC (rev 7905)
@@ -6,6 +6,7 @@
# Optional JBoss Home
jboss422.home=(a)jboss422.home@
jboss423.home=(a)jboss423.home@
+jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-07-24 11:21:27 UTC (rev 7905)
@@ -73,9 +73,31 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- Deployment JBoss424 -->
<!-- ================================================================== -->
+
+ <target name="target-jboss424">
+ <property name="jbossws.integration.target"
value="jboss424"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}"
file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss424"
depends="undeploy-jboss424,deploy-structure-jboss42" description="Deploy
jbossws to jboss424">
+ <fail message="Not available: ${jboss424.available.file}"
unless="jboss424.available"/>
+ <copy todir="${jboss424.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss424.home}/bin" perm="+x"
includes="*.sh"/>
+ </target>
+ <target name="undeploy-jboss424" depends="target-jboss424,init"
description="Remove jbossws from jboss424">
+ <fail message="Not available: ${jboss424.available.file}"
unless="jboss424.available"/>
+ <macro-undeploy-jbossws42
targetdir="${jboss424.server.deploy}/jbossws.sar"
defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-5.0.x -->
+ <!-- ================================================================== -->
+
<target name="deploy-structure-jboss50"
depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf50" inheritall="false">
Modified: stack/cxf/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-07-24 11:21:27 UTC (rev 7905)
@@ -35,6 +35,12 @@
<property name="jboss423.server.lib"
value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy"
value="${jboss423.server}/deploy"/>
+ <property name="jboss424.lib"
value="${jboss424.home}/lib"/>
+ <property name="jboss424.client"
value="${jboss424.home}/client"/>
+ <property name="jboss424.server"
value="${jboss424.home}/server/${jboss.server.instance}"/>
+ <property name="jboss424.server.lib"
value="${jboss424.server}/lib"/>
+ <property name="jboss424.server.deploy"
value="${jboss424.server}/deploy"/>
+
<property name="jboss500.lib"
value="${jboss500.home}/lib"/>
<property name="jboss500.client"
value="${jboss500.home}/client"/>
<property name="jboss500.server"
value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -51,11 +57,13 @@
<property name="jboss422.available.file"
value="${jboss422.client}/jboss-client.jar"/>
<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"/>
<available property="jboss422.available"
file="${jboss422.available.file}"/>
<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}"/>
Modified: stack/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml 2008-07-24 10:37:00 UTC (rev 7904)
+++ stack/cxf/trunk/src/main/distro/build.xml 2008-07-24 11:21:27 UTC (rev 7905)
@@ -51,6 +51,7 @@
<or>
<equals arg1="${jbossws.integration.target}"
arg2="jboss422"/>
<equals arg1="${jbossws.integration.target}"
arg2="jboss423"/>
+ <equals arg1="${jbossws.integration.target}"
arg2="jboss424"/>
</or>
</condition>
<condition property="jbossws.integration.jboss50"
value="true">
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-24 10:37:00 UTC
(rev 7904)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-24 11:21:27 UTC
(rev 7905)
@@ -78,19 +78,21 @@
<includes>
<include>*:jbossws-framework:jar</include>
<include>*:jbossws-jboss422:jar</include>
+ <include>*:jbossws-jboss423:jar</include>
<include>*:juddi-service:sar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
-
<outputFileNameMapping>jbossws-jboss423.${module.extension}</outputFileNameMapping>
+
<outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss423x:jar</include>
+ <include>*:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
+ <!-- [JBWS-2263] -->
<!--dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>