9:36 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2013-04-29 10:36:24 -0400 (Mon, 29 Apr 2013)
New Revision: 17521
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/
stack/cxf/trunk/modules/testsuite/src/test/resources/wildfly800/
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/jaxrpc-integration/
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/native/
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss800/
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3627] JBoss AS -> WildFly
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2013-04-29 14:32:18 UTC (rev 17520)
+++ stack/cxf/trunk/build.xml 2013-04-29 14:36:24 UTC (rev 17521)
@@ -77,12 +77,12 @@
<condition property="jboss720.home"
value="${profiles.profile.properties.jboss720.home}">
<isset property="profiles.profile.properties.jboss720.home"/>
</condition>
- <condition property="jboss800.home"
value="${profiles.profile.properties.jboss800.home}">
- <isset property="profiles.profile.properties.jboss800.home"/>
+ <condition property="wildfly800.home"
value="${profiles.profile.properties.wildfly800.home}">
+ <isset property="profiles.profile.properties.wildfly800.home"/>
</condition>
- <fail message="jboss home not set, jboss712.home=value, jboss713.home=value,
jboss720.home=value or jboss800.home=value to set">
+ <fail message="Application server home not set, jboss712.home=value,
jboss713.home=value, jboss720.home=value or wildfly800.home=value to set">
<condition>
<and>
<not>
@@ -95,7 +95,7 @@
<isset property="jboss720.home"/>
</not>
<not>
- <isset property="jboss800.home"/>
+ <isset property="wildfly800.home"/>
</not>
</and>
</condition>
@@ -105,7 +105,7 @@
<echo message="jboss712.home=${jboss712.home}"/>
<echo message="jboss713.home=${jboss713.home}"/>
<echo message="jboss720.home=${jboss720.home}"/>
- <echo message="jboss800.home=${jboss800.home}"/>
+ <echo message="wildfly800.home=${wildfly800.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2013-04-29 14:32:18 UTC (rev 17520)
+++ stack/cxf/trunk/modules/dist/pom.xml 2013-04-29 14:36:24 UTC (rev 17521)
@@ -53,7 +53,7 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss800</classifier>
+ <classifier>wildfly800</classifier>
</dependency>
<dependency>
@@ -208,8 +208,8 @@
<xslt
style="${basedir}/src/main/distro/test-exclude.xsl"
in="../testsuite/pom.xml"
out="${basedir}/target/exclude-file/test-excludes-jboss720.txt">
<param name="targetName"
expression="jboss720" />
</xslt>
- <xslt
style="${basedir}/src/main/distro/test-exclude.xsl"
in="../testsuite/pom.xml"
out="${basedir}/target/exclude-file/test-excludes-jboss800.txt">
- <param name="targetName"
expression="jboss800" />
+ <xslt
style="${basedir}/src/main/distro/test-exclude.xsl"
in="../testsuite/pom.xml"
out="${basedir}/target/exclude-file/test-excludes-wildfly800.txt">
+ <param name="targetName"
expression="wildfly800" />
</xslt>
</target>
</configuration>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2013-04-29 14:32:18 UTC (rev
17520)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2013-04-29 14:36:24 UTC (rev
17521)
@@ -16,7 +16,7 @@
ant deploy-jboss712
ant deploy-jboss713
ant deploy-jboss720
- ant deploy-jboss800
+ ant deploy-wildfly800
By default Spring Framework libraries are not installed to application
server. In order to do that, please add the -Dspring=true property option when
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2013-04-29
14:32:18 UTC (rev 17520)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2013-04-29
14:36:24 UTC (rev 17521)
@@ -6,9 +6,9 @@
jboss712.home=(a)jboss712.home@
jboss713.home=(a)jboss713.home@
jboss720.home=(a)jboss720.home@
-jboss800.home=(a)jboss800.home@
+wildfly800.home=(a)wildfly800.home@
-# The JBoss server under test. This can be [jboss712|jboss713|jboss720|jboss800]
+# The JBoss server under test. This can be [jboss712|jboss713|jboss720|wildfly800]
jbossws.integration.target=jboss713
# The JBoss settings
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-04-29 14:32:18 UTC
(rev 17520)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-04-29 14:36:24 UTC
(rev 17521)
@@ -180,10 +180,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-8.0.x -->
+ <!-- Prepare Deployment Structure WildFly-8.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss80x"
depends="prepare-deploy">
+ <target name="deploy-structure-wildfly80x"
depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<path id="jboss.ant.tasks.classpath">
@@ -204,10 +204,10 @@
<param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
<param name="jbossid"
value="${jbossws.integration.target}"/>
- <param name="modules-jbossid" value="jboss800"/>
+ <param name="modules-jbossid" value="wildfly800"/>
</antcall>
<copy toDir="${deploy.structure}/modules/system/layers/base">
- <fileset dir="${deploy.artifacts.dir}/modules/jboss800">
+ <fileset dir="${deploy.artifacts.dir}/modules/wildfly800">
<include name="**/jboss/as/webservices/main/module.xml"/>
<include
name="**/jboss/as/webservices/server/integration/main/module.xml"/>
</fileset>
@@ -215,32 +215,32 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment jboss800 -->
+ <!-- Deployment wildfly800 -->
<!-- ================================================================== -->
- <target name="target-jboss800">
- <property name="jbossws.integration.target"
value="jboss800"/>
+ <target name="target-wildfly800">
+ <property name="jbossws.integration.target"
value="wildfly800"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}"
file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss800"
depends="undeploy-jboss800,deploy-structure-jboss80x,check-spring,install-spring-module80x"
description="Deploy jbossws to jboss800">
- <fail message="Not available: ${jboss800.available.file}"
unless="jboss800.available"/>
- <copy todir="${jboss800.home}" overwrite="true"
verbose="true">
+ <target name="deploy-wildfly800"
depends="undeploy-wildfly800,deploy-structure-wildfly80x,check-spring,install-spring-module80x"
description="Deploy jbossws to wildfly800">
+ <fail message="Not available: ${wildfly800.available.file}"
unless="wildfly800.available"/>
+ <copy todir="${wildfly800.home}" overwrite="true"
verbose="true">
<fileset dir="${deploy.structure}">
<exclude name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</copy>
<!-- Install org/jboss/as/webservices module.xml separately since it needs to
reference libs already on the AS -->
- <installModules
targetDir="${jboss800.home}/modules/system/layers/base/">
+ <installModules
targetDir="${wildfly800.home}/modules/system/layers/base/">
<fileset dir="${deploy.structure}/modules/system/layers/base">
<include name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
</target>
- <target name="undeploy-jboss800" depends="target-jboss800,init"
description="Remove jbossws from jboss800">
- <fail message="Not available: ${jboss800.available.file}"
unless="jboss800.available"/>
- <macro-undeploy-jbossws-modules
targetdir="${jboss800.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
+ <target name="undeploy-wildfly800"
depends="target-wildfly800,init" description="Remove jbossws from
wildfly800">
+ <fail message="Not available: ${wildfly800.available.file}"
unless="wildfly800.available"/>
+ <macro-undeploy-jbossws-modules
targetdir="${wildfly800.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
</target>
<!-- ================================================================== -->
@@ -274,7 +274,7 @@
<antcall target="deploy-spring-module" inheritall="false">
<param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
- <param name="modules-jbossid" value="jboss800"/>
+ <param name="modules-jbossid" value="wildfly800"/>
</antcall>
</target>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2013-04-29 14:32:18 UTC
(rev 17520)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2013-04-29 14:36:24 UTC
(rev 17521)
@@ -36,12 +36,12 @@
<property name="jboss712.available.file"
value="${jboss712.home}/jboss-modules.jar"/>
<property name="jboss713.available.file"
value="${jboss713.home}/jboss-modules.jar"/>
<property name="jboss720.available.file"
value="${jboss720.home}/jboss-modules.jar"/>
- <property name="jboss800.available.file"
value="${jboss800.home}/jboss-modules.jar"/>
+ <property name="wildfly800.available.file"
value="${wildfly800.home}/jboss-modules.jar"/>
<available property="jboss712.available"
file="${jboss712.available.file}"/>
<available property="jboss713.available"
file="${jboss713.available.file}"/>
<available property="jboss720.available"
file="${jboss720.available.file}"/>
- <available property="jboss800.available"
file="${jboss800.available.file}"/>
+ <available property="wildfly800.available"
file="${wildfly800.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-04-29 14:32:18 UTC (rev
17520)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-04-29 14:36:24 UTC (rev
17521)
@@ -70,9 +70,9 @@
</or>
</condition>
- <condition property="jbossws.integration.jboss80x"
value="true">
+ <condition property="jbossws.integration.wildfly80x"
value="true">
<or>
- <equals arg1="${jbossws.integration.target}"
arg2="jboss800"/>
+ <equals arg1="${jbossws.integration.target}"
arg2="wildfly800"/>
</or>
</condition>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-04-29
14:32:18 UTC (rev 17520)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-04-29
14:36:24 UTC (rev 17521)
@@ -90,6 +90,7 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss*-tests-integration:jar</include>
+
<include>org.jboss.ws:jbossws-wildlfy*-tests-integration:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<scope>provided</scope>
@@ -103,7 +104,7 @@
<includes>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
</includes>
-
<outputFileNameMapping>jbossws-jboss800-tests-integration.jar</outputFileNameMapping>
+
<outputFileNameMapping>jbossws-wildfly800-tests-integration.jar</outputFileNameMapping>
<scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
@@ -113,6 +114,7 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss*-server-integration:jar</include>
+
<include>org.jboss.ws:jbossws-wildfly*-server-integration:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<scope>provided</scope>
@@ -124,6 +126,7 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include>
+
<include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:wildfly*</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
<useProjectArtifact>false</useProjectArtifact>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2013-04-29 14:32:18 UTC (rev 17520)
+++ stack/cxf/trunk/modules/resources/pom.xml 2013-04-29 14:36:24 UTC (rev 17521)
@@ -78,12 +78,12 @@
</configuration>
</execution>
<execution>
- <id>jboss800</id>
+ <id>wildfly800</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
<configuration>
- <classifier>jboss800</classifier>
-
<classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss800/jbossws.beans</classesDirectory>
+ <classifier>wildfly800</classifier>
+
<classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly800/jbossws.beans</classesDirectory>
</configuration>
</execution>
</executions>
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 2013-04-29
14:32:18 UTC (rev 17520)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2013-04-29
14:36:24 UTC (rev 17521)
@@ -58,7 +58,7 @@
<copy
file="${src.dir}/jbossws-cxf-config-as8.xml"
-
tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+
tofile="${dest.dir}/jbossws-wildfly800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
</target>
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml 2013-04-29
14:32:18 UTC (rev 17520)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml 2013-04-29
14:36:24 UTC (rev 17521)
@@ -3,6 +3,7 @@
<deployment>
<exclude-subsystems>
<subsystem name="webservices" />
+ <subsystem name="weld" /> <!-- Prevent WELD-000070 failure
-->
</exclude-subsystems>
<!-- Dependencies below included for the sake of simplifying test only, would
actually come within the deployment in this scenario -->
<dependencies>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-29 14:32:18 UTC (rev 17520)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-29 14:36:24 UTC (rev 17521)
@@ -785,14 +785,14 @@
</profile>
<!--
- Name: jboss800
- Descr: JBoss-8.0.0 specific options
+ Name: wildfly800
+ Descr: WildFly-8.0.0 specific options
-->
<profile>
- <id>jboss800</id>
+ <id>wildfly800</id>
<properties>
- <jboss.version>${jboss800.version}</jboss.version>
- <jbossws.integration.target>jboss800</jbossws.integration.target>
+ <jboss.version>${wildfly800.version}</jboss.version>
+ <jbossws.integration.target>wildfly800</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-04-29 14:32:18 UTC (rev 17520)
+++ stack/cxf/trunk/pom.xml 2013-04-29 14:36:24 UTC (rev 17521)
@@ -71,7 +71,7 @@
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Final</jboss720.version>
- <jboss800.version>8.0.0.Alpha1-SNAPSHOT</jboss800.version>
+ <wildfly800.version>8.0.0.Alpha1-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.7.4</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss800.version}</version>
+ <version>${wildfly800.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.projects</groupId>
@@ -1382,14 +1382,14 @@
</profile>
<!--
- Name: jboss800
- Descr: JBoss-8.0.0 specific options
+ Name: wildfly800
+ Descr: WildFly-8.0.0 specific options
-->
<profile>
- <id>jboss800</id>
+ <id>wildfly800</id>
<properties>
- <jbossws.integration.target>jboss800</jbossws.integration.target>
- <jboss.home>${jboss800.home}</jboss.home>
+ <jbossws.integration.target>wildfly800</jbossws.integration.target>
+ <jboss.home>${wildfly800.home}</jboss.home>
</properties>
</profile>