[jbossws-commits] JBossWS SVN: r16018 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Mar 23 13:20:43 EDT 2012
Author: alessio.soldano at jboss.com
Date: 2012-03-23 13:20:42 -0400 (Fri, 23 Mar 2012)
New Revision: 16018
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/build.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Target jboss712 instead of 711
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/build.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/build.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -68,21 +68,21 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss711.home" value="${profiles.profile.properties.jboss711.home}">
+ <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}">
<isset property="profiles.profile.properties.jboss711.home"/>
</condition>
- <fail message="jboss home not set, use jboss711.home=value to set">
+ <fail message="jboss home not set, use jboss712.home=value to set">
<condition>
<not>
- <isset property="jboss711.home"/>
+ <isset property="jboss712.home"/>
</not>
</condition>
</fail>
<echo/>
- <echo message="jboss711.home=${jboss711.home}"/>
+ <echo message="jboss712.home=${jboss712.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -33,7 +33,7 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss711</classifier>
+ <classifier>jboss712</classifier>
</dependency>
<dependency>
@@ -165,8 +165,8 @@
<configuration>
<tasks>
<mkdir dir="${basedir}/target/exclude-file" />
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss711.txt">
- <param name="targetName" expression="jboss711" />
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss712.txt">
+ <param name="targetName" expression="jboss712" />
</xslt>
</tasks>
</configuration>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/Install.txt 2012-03-23 17:20:42 UTC (rev 16018)
@@ -13,13 +13,13 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss711
+ ant deploy-jboss712
By default Spring Framework libraries are not installed to application
server. In order to do that, please add the -Dspring=true property option when
running the ant script:
- ant -Dspring=true deploy-jboss711
+ ant -Dspring=true deploy-jboss712
Please note Spring is required for advanced configuration only, whenever users
want to provide their own jbossws-cxf.xml Spring configuration file.
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-03-23 17:20:42 UTC (rev 16018)
@@ -3,10 +3,10 @@
#
# Optional JBoss Home
-jboss711.home=@jboss711.home@
+jboss712.home=@jboss712.home@
# The JBoss server under test.
-jbossws.integration.target=jboss711
+jbossws.integration.target=jboss712
# The JBoss settings
jboss.bind.address=localhost
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -47,32 +47,32 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment jboss711 -->
+ <!-- Deployment jboss712 -->
<!-- ================================================================== -->
- <target name="target-jboss711">
- <property name="jbossws.integration.target" value="jboss711"/>
+ <target name="target-jboss712">
+ <property name="jbossws.integration.target" value="jboss712"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss711" depends="undeploy-jboss711,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss711">
- <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
- <copy todir="${jboss711.home}" overwrite="true" verbose="true">
+ <target name="deploy-jboss712" depends="undeploy-jboss712,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss712">
+ <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/>
+ <copy todir="${jboss712.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="${jboss711.home}/modules">
+ <installModules targetDir="${jboss712.home}/modules">
<fileset dir="${deploy.structure}/modules">
<include name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
</target>
- <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711">
- <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712">
+ <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -35,9 +35,9 @@
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/>
+ <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/>
- <available property="jboss711.available" file="${jboss711.available.file}"/>
+ <available property="jboss712.available" file="${jboss712.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -59,7 +59,7 @@
<condition property="jbossws.integration.jboss710" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss712"/>
</or>
</condition>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -43,12 +43,12 @@
<phase>package</phase>
</execution>
<execution>
- <id>jboss711</id>
+ <id>jboss712</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
<configuration>
- <classifier>jboss711</classifier>
- <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory>
+ <classifier>jboss712</classifier>
+ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory>
</configuration>
</execution>
</executions>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/scripts/antrun-beans-config.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -31,11 +31,11 @@
<copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
/>
</target>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -573,14 +573,14 @@
</profile>
<!--
- Name: jboss711
- Descr: JBoss-7.1.1 specific options
+ Name: jboss712
+ Descr: JBoss-7.1.2 specific options
-->
<profile>
- <id>jboss711</id>
+ <id>jboss712</id>
<properties>
- <jboss.version>${jboss711.version}</jboss.version>
- <jbossws.integration.target>jboss711</jbossws.integration.target>
+ <jboss.version>${jboss712.version}</jboss.version>
+ <jbossws.integration.target>jboss712</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -755,7 +755,7 @@
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
- <!-- JBossWS Native Core version available on 711 -->
+ <!-- JBossWS Native Core version available on 712 -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement>
<!-- JBossWS Native Core version specified through system property -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-23 15:15:08 UTC (rev 16017)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-23 17:20:42 UTC (rev 16018)
@@ -64,7 +64,7 @@
<jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.1-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version>
- <jboss711.version>7.1.1.Final</jboss711.version> <!-- replace with the EAP6 snapshot version -->
+ <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <!-- replace with the EAP6 snapshot version -->
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.4.6</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss711.version}</version>
+ <version>${jboss712.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.projects</groupId>
@@ -1230,10 +1230,10 @@
Descr: JBoss-7.1.1 specific options
-->
<profile>
- <id>jboss711</id>
+ <id>jboss712</id>
<properties>
- <jbossws.integration.target>jboss711</jbossws.integration.target>
- <jboss.home>${jboss711.home}</jboss.home>
+ <jbossws.integration.target>jboss712</jbossws.integration.target>
+ <jboss.home>${jboss712.home}</jboss.home>
</properties>
</profile>
More information about the jbossws-commits
mailing list