[jbossws-commits] JBossWS SVN: r14790 - in stack/cxf/branches/jbossws-cxf-3.4.1.SP1: modules/server and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Aug 8 13:11:38 EDT 2011
Author: richard.opalka at jboss.com
Date: 2011-08-08 13:11:38 -0400 (Mon, 08 Aug 2011)
New Revision: 14790
Added:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt
Removed:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss601.txt
Modified:
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/build.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/ant.properties.example
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-setup.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build.xml
stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/scripts/assembly-deploy-artifacts.xml
Log:
adding support for AS 6.1.0
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/build.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/build.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -65,8 +65,8 @@
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
- <condition property="jboss601.home" value="${profiles.profile.properties.jboss601.home}">
- <isset property="profiles.profile.properties.jboss601.home"/>
+ <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}">
+ <isset property="profiles.profile.properties.jboss610.home"/>
</condition>
<!-- Loads the properties from the user profile -->
@@ -74,13 +74,13 @@
<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}"/>
- <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/>
+ <property name="jboss610.home" value="${profiles.profile.properties.jboss610.home}"/>
<echo/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
- <echo message="jboss601.home=${jboss601.home}"/>
+ <echo message="jboss610.home=${jboss610.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -310,10 +310,10 @@
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory>
</artifactItem>
-->
<!-- END -->
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/src/main/scripts/antrun-beans-config.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/server/src/main/scripts/antrun-beans-config.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -33,7 +33,7 @@
<copy
file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
@@ -43,7 +43,7 @@
<copy
file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
- tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jaxrpc-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
</target>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -641,14 +641,14 @@
</profile>
<!--
- Name: jboss601
- Descr: JBoss-6.0.1 specific options
+ Name: jboss610
+ Descr: JBoss-6.1.0 specific options
-->
<profile>
- <id>jboss601</id>
+ <id>jboss610</id>
<properties>
- <jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
+ <jboss.version>6.1.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -731,14 +731,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss601.txt</testExcludeFile>
- <compilerArgument>-Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</compilerArgument>
+ <testExcludeFile>../test-excludes-jboss610.txt</testExcludeFile>
+ <compilerArgument>-Djava.endorsed.dirs=${jboss610.home}/lib/endorsed</compilerArgument>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss610.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
Deleted: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss601.txt 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss601.txt 2011-08-08 17:11:38 UTC (rev 14790)
@@ -1,26 +0,0 @@
-# UsernameTestCase requires trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-
-# [CXF-1519] Explicitly set the namespace of a WebFault
-org/jboss/test/ws/jaxws/jbws1904/**
-
-# [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-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBAS-8363] Virtual host issue in JBossWeb
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# Seems MSFT interop. endpoints are down :(
-org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
Added: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt 2011-08-08 17:11:38 UTC (rev 14790)
@@ -0,0 +1,26 @@
+# UsernameTestCase requires trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
+
+# [CXF-1519] Explicitly set the namespace of a WebFault
+org/jboss/test/ws/jaxws/jbws1904/**
+
+# [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-2561] XOP request not properly inlined
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBAS-8363] Virtual host issue in JBossWeb
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# Seems MSFT interop. endpoints are down :(
+org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
Property changes on: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/modules/testsuite/test-excludes-jboss610.txt
___________________________________________________________________
Added: svn:executable
+ *
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/pom.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -48,14 +48,14 @@
<properties>
<jbossws.spi.version>1.4.1.GA</jbossws.spi.version>
<jbossws.common.version>1.4.1.GA</jbossws.common.version>
- <jbossws.framework.version>3.4.1.SP1-SNAPSHOT</jbossws.framework.version>
+ <jbossws.framework.version>3.4.1.GA</jbossws.framework.version>
<jbossws.jboss501.version>3.4.0.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.4.0.GA</jbossws.jboss510.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
<jbossws.jboss600M5.version>3.4.1.GA</jbossws.jboss600M5.version>
- <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
+ <jbossws.jboss610.version>3.4.1.GA</jbossws.jboss610.version>
-->
<!-- END -->
<cxf.version>2.3.1</cxf.version>
@@ -172,12 +172,12 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <version>${jbossws.jboss610.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -1416,14 +1416,14 @@
</profile>
<!--
- Name: jboss601
- Descr: JBoss-6.0.1 specific options
+ Name: jboss610
+ Descr: JBoss-6.1.0 specific options
-->
<profile>
- <id>jboss601</id>
+ <id>jboss610</id>
<properties>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
- <jboss.home>${jboss601.home}</jboss.home>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
+ <jboss.home>${jboss610.home}</jboss.home>
</properties>
</profile>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/ant.properties.example 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/ant.properties.example 2011-08-08 17:11:38 UTC (rev 14790)
@@ -3,9 +3,9 @@
#
# Optional JBoss Home
-jboss600.home=@jboss601.home@
+jboss610.home=@jboss610.home@
-jbossws.integration.target=jboss600
+jbossws.integration.target=jboss610
# The JBoss settings
jboss.server.instance=default
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-deploy.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-deploy.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -138,10 +138,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.1 -->
+ <!-- Prepare Deployment Structure JBoss-6.1.0 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss601" depends="prepare-deploy">
+ <target name="deploy-structure-jboss610" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -153,26 +153,26 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss601 -->
+ <!-- Deployment JBoss610 -->
<!-- ================================================================== -->
- <target name="target-jboss601">
- <property name="jbossws.integration.target" value="jboss601"/>
+ <target name="target-jboss610">
+ <property name="jbossws.integration.target" value="jboss610"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring" description="Deploy jbossws to jboss601">
+ <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610,check-spring,install-spring" description="Deploy jbossws to jboss610">
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
- <copy todir="${jboss601.home}" overwrite="true" verbose="true">
+ <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+ <copy todir="${jboss610.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601">
- <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
- <macro-undeploy-jbossws targetdir="${jboss601.server}"
+ <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610">
+ <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss610.server}"
defaultconf="${jbossws.default.deploy.conf}"
defaultserverconf="${jbossws.default.server.deploy.conf}"
modifyjbossintegration="false"
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-setup.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build-setup.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -42,22 +42,22 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
- <property name="jboss601.lib" value="${jboss601.home}/lib"/>
- <property name="jboss601.client" value="${jboss601.home}/client"/>
- <property name="jboss601.server" value="${jboss601.home}/server/${jboss.server.instance}"/>
- <property name="jboss601.server.lib" value="${jboss601.home}/common/lib"/>
- <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/>
- <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/>
+ <property name="jboss610.lib" value="${jboss610.home}/lib"/>
+ <property name="jboss610.client" value="${jboss610.home}/client"/>
+ <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/>
+ <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/>
+ <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/>
+ <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/>
<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"/>
- <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
+ <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
- <available property="jboss601.available" file="${jboss601.available.file}"/>
+ <available property="jboss610.available" file="${jboss610.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/distro/build.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -59,9 +59,13 @@
<condition property="jbossws.integration.jboss60" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
</or>
</condition>
+ <condition property="jbossws.integration.jboss61" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
+ </or>
+ </condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
Modified: stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-08 16:36:12 UTC (rev 14789)
+++ stack/cxf/branches/jbossws-cxf-3.4.1.SP1/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-08 17:11:38 UTC (rev 14790)
@@ -185,7 +185,7 @@
</dependencySet>
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss610.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
More information about the jbossws-commits
mailing list