3:38 a.m.
Author: asoldano
Date: 2014-05-05 04:38:18 -0400 (Mon, 05 May 2014)
New Revision: 18609
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-testsuite.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/pom.xml
stack/cxf/trunk/pom.xml
Log:
Wildfly 8.0.1 -> 8.1.0
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2014-05-05 08:05:10 UTC (rev 18608)
+++ stack/cxf/trunk/build.xml 2014-05-05 08:38:18 UTC (rev 18609)
@@ -74,12 +74,12 @@
<condition property="wildfly800.home"
value="${profiles.profile.properties.wildfly800.home}">
<isset property="profiles.profile.properties.wildfly800.home"/>
</condition>
- <condition property="wildfly801.home"
value="${profiles.profile.properties.wildfly801.home}">
- <isset property="profiles.profile.properties.wildfly801.home"/>
+ <condition property="wildfly810.home"
value="${profiles.profile.properties.wildfly810.home}">
+ <isset property="profiles.profile.properties.wildfly810.home"/>
</condition>
- <fail message="Application server home not set, jboss720.home=value,
wildfly800.home=value or wildfly801.home=value to set">
+ <fail message="Application server home not set, jboss720.home=value,
wildfly800.home=value or wildfly810.home=value to set">
<condition>
<and>
<not>
@@ -89,7 +89,7 @@
<isset property="wildfly800.home"/>
</not>
<not>
- <isset property="wildfly801.home"/>
+ <isset property="wildfly810.home"/>
</not>
</and>
</condition>
@@ -98,7 +98,7 @@
<echo/>
<echo message="jboss720.home=${jboss720.home}"/>
<echo message="wildfly800.home=${wildfly800.home}"/>
- <echo message="wildfly801.home=${wildfly801.home}"/>
+ <echo message="wildfly810.home=${wildfly810.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 2014-05-05 08:05:10 UTC (rev 18608)
+++ stack/cxf/trunk/modules/dist/pom.xml 2014-05-05 08:38:18 UTC (rev 18609)
@@ -64,7 +64,7 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>wildfly801</classifier>
+ <classifier>wildfly810</classifier>
</dependency>
<dependency>
@@ -200,8 +200,8 @@
<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>
- <xslt
style="${basedir}/src/main/distro/test-exclude.xsl"
in="../testsuite/pom.xml"
out="${basedir}/target/exclude-file/test-excludes-wildfly801.txt">
- <param name="targetName"
expression="wildfly801" />
+ <xslt
style="${basedir}/src/main/distro/test-exclude.xsl"
in="../testsuite/pom.xml"
out="${basedir}/target/exclude-file/test-excludes-wildfly810.txt">
+ <param name="targetName"
expression="wildfly810" />
</xslt>
</target>
</configuration>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-05-05 08:05:10 UTC (rev
18608)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-05-05 08:38:18 UTC (rev
18609)
@@ -15,7 +15,7 @@
ant deploy-jboss720
ant deploy-wildfly800
- ant deploy-wildfly801
+ ant deploy-wildfly810
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 2014-05-05
08:05:10 UTC (rev 18608)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2014-05-05
08:38:18 UTC (rev 18609)
@@ -5,9 +5,9 @@
# Optional JBoss Home
jboss720.home=(a)jboss720.home@
wildfly800.home=(a)wildfly800.home@
-wildfly801.home=(a)wildfly801.home@
+wildfly810.home=(a)wildfly810.home@
-# The JBoss server under test. This can be [jboss720|wildfly800|wildfly801]
+# The JBoss server under test. This can be [jboss720|wildfly800|wildfly810]
jbossws.integration.target=jboss720
# 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 2014-05-05 08:05:10 UTC
(rev 18608)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-05-05 08:38:18 UTC
(rev 18609)
@@ -152,32 +152,32 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment wildfly801 -->
+ <!-- Deployment wildfly810 -->
<!-- ================================================================== -->
- <target name="target-wildfly801">
- <property name="jbossws.integration.target"
value="wildfly801"/>
+ <target name="target-wildfly810">
+ <property name="jbossws.integration.target"
value="wildfly810"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}"
file="${target.properties.file}"/>
</target>
- <target name="deploy-wildfly801"
depends="undeploy-wildfly801,deploy-structure-wildfly80x,check-spring,install-spring-module80x"
description="Deploy jbossws to wildfly801">
- <fail message="Not available: ${wildfly801.available.file}"
unless="wildfly801.available"/>
- <copy todir="${wildfly801.home}" overwrite="true"
verbose="true">
+ <target name="deploy-wildfly810"
depends="undeploy-wildfly810,deploy-structure-wildfly80x,check-spring,install-spring-module80x"
description="Deploy jbossws to wildfly810">
+ <fail message="Not available: ${wildfly810.available.file}"
unless="wildfly810.available"/>
+ <copy todir="${wildfly810.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="${wildfly801.home}/modules/system/layers/base/">
+ <installModules
targetDir="${wildfly810.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-wildfly801"
depends="target-wildfly801,init" description="Remove jbossws from
wildfly801">
- <fail message="Not available: ${wildfly801.available.file}"
unless="wildfly801.available"/>
- <macro-undeploy-jbossws-modules
targetdir="${wildfly801.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
+ <target name="undeploy-wildfly810"
depends="target-wildfly810,init" description="Remove jbossws from
wildfly810">
+ <fail message="Not available: ${wildfly810.available.file}"
unless="wildfly810.available"/>
+ <macro-undeploy-jbossws-modules
targetdir="${wildfly810.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2014-05-05 08:05:10 UTC
(rev 18608)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2014-05-05 08:38:18 UTC
(rev 18609)
@@ -35,11 +35,11 @@
<property name="jboss720.available.file"
value="${jboss720.home}/jboss-modules.jar"/>
<property name="wildfly800.available.file"
value="${wildfly800.home}/jboss-modules.jar"/>
- <property name="wildfly801.available.file"
value="${wildfly801.home}/jboss-modules.jar"/>
+ <property name="wildfly810.available.file"
value="${wildfly810.home}/jboss-modules.jar"/>
<available property="jboss720.available"
file="${jboss720.available.file}"/>
<available property="wildfly800.available"
file="${wildfly800.available.file}"/>
- <available property="wildfly801.available"
file="${wildfly801.available.file}"/>
+ <available property="wildfly810.available"
file="${wildfly810.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-05 08:05:10
UTC (rev 18608)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-05 08:38:18
UTC (rev 18609)
@@ -37,8 +37,8 @@
<condition property="jboss.home"
value="${wildfly800.home}">
<equals arg1="${jbossws.integration.target}"
arg2="wildfly800"/>
</condition>
- <condition property="jboss.home"
value="${wildfly801.home}">
- <equals arg1="${jbossws.integration.target}"
arg2="wildfly801"/>
+ <condition property="jboss.home"
value="${wildfly810.home}">
+ <equals arg1="${jbossws.integration.target}"
arg2="wildfly810"/>
</condition>
<!-- Verify required properties that must be set before this file is imported
-->
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-05-05 08:05:10 UTC (rev
18608)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-05-05 08:38:18 UTC (rev
18609)
@@ -66,7 +66,7 @@
<condition property="jbossws.integration.wildfly80x"
value="true">
<or>
<equals arg1="${jbossws.integration.target}"
arg2="wildfly800"/>
- <equals arg1="${jbossws.integration.target}"
arg2="wildfly801"/>
+ <equals arg1="${jbossws.integration.target}"
arg2="wildfly810"/>
</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 2014-05-05
08:05:10 UTC (rev 18608)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-05-05
08:38:18 UTC (rev 18609)
@@ -112,7 +112,7 @@
<includes>
<include>org.wildfly:wildfly-webservices-tests-integration:jar</include>
</includes>
-
<outputFileNameMapping>jbossws-wildfly801-tests-integration.jar</outputFileNameMapping>
+
<outputFileNameMapping>jbossws-wildfly810-tests-integration.jar</outputFileNameMapping>
<scope>provided</scope>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2014-05-05 08:05:10 UTC (rev 18608)
+++ stack/cxf/trunk/modules/resources/pom.xml 2014-05-05 08:38:18 UTC (rev 18609)
@@ -69,12 +69,12 @@
</configuration>
</execution>
<execution>
- <id>wildfly801</id>
+ <id>wildfly810</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
<configuration>
- <classifier>wildfly801</classifier>
-
<classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly801/jbossws.beans</classesDirectory>
+ <classifier>wildfly810</classifier>
+
<classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly810/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 2014-05-05
08:05:10 UTC (rev 18608)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2014-05-05
08:38:18 UTC (rev 18609)
@@ -45,7 +45,7 @@
<copy
file="${src.dir}/jbossws-cxf-config-as8.xml"
-
tofile="${dest.dir}/jbossws-wildfly801/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+
tofile="${dest.dir}/jbossws-wildfly810/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
</target>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-05 08:05:10 UTC (rev 18608)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-05 08:38:18 UTC (rev 18609)
@@ -812,14 +812,14 @@
</profile>
<!--
- Name: wildfly801
- Descr: WildFly-8.0.1 specific options
+ Name: wildfly810
+ Descr: WildFly-8.1.0 specific options
-->
<profile>
- <id>wildfly801</id>
+ <id>wildfly810</id>
<properties>
- <jboss.version>${wildfly801.version}</jboss.version>
- <jbossws.integration.target>wildfly801</jbossws.integration.target>
+ <jboss.version>${wildfly810.version}</jboss.version>
+ <jbossws.integration.target>wildfly810</jbossws.integration.target>
<remote.port>8080</remote.port>
<remote.protocol>http-remoting</remote.protocol>
</properties>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-05-05 08:05:10 UTC (rev 18608)
+++ stack/cxf/trunk/pom.xml 2014-05-05 08:38:18 UTC (rev 18609)
@@ -69,7 +69,7 @@
<jbossws.native.version>4.2.0.Final</jbossws.native.version>
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Final</wildfly800.version>
- <wildfly801.version>8.0.1.Final-SNAPSHOT</wildfly801.version>
+ <wildfly810.version>8.1.0.Final-SNAPSHOT</wildfly810.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
<cxf.version>3.0.0-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
@@ -162,7 +162,7 @@
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-webservices-tests-integration</artifactId>
- <version>${wildfly801.version}</version>
+ <version>${wildfly810.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.projects</groupId>
@@ -1379,14 +1379,14 @@
</profile>
<!--
- Name: wildfly801
- Descr: WildFly-8.0.1 specific options
+ Name: wildfly810
+ Descr: WildFly-8.1.0 specific options
-->
<profile>
- <id>wildfly801</id>
+ <id>wildfly810</id>
<properties>
- <jbossws.integration.target>wildfly801</jbossws.integration.target>
- <jboss.home>${wildfly801.home}</jboss.home>
+ <jbossws.integration.target>wildfly810</jbossws.integration.target>
+ <jboss.home>${wildfly810.home}</jboss.home>
</properties>
</profile>