[jbossws-commits] JBossWS SVN: r14892 - in stack/cxf/trunk: modules/dist and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Aug 17 08:14:25 EDT 2011
Author: richard.opalka at jboss.com
Date: 2011-08-17 08:14:24 -0400 (Wed, 17 Aug 2011)
New Revision: 14892
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/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
Log:
support for AS 6.1.0.Final
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/build.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -61,8 +61,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>
<condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
<isset property="profiles.profile.properties.jboss700.home"/>
@@ -72,14 +72,14 @@
</condition>
- <fail message="jboss home not set, use jboss601.home=value, jboss600.home=value, jboss700.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value or jboss710.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss601.home"/>
+ <isset property="jboss600.home"/>
</not>
<not>
- <isset property="jboss600.home"/>
+ <isset property="jboss610.home"/>
</not>
<not>
<isset property="jboss700.home"/>
@@ -93,7 +93,7 @@
<echo/>
<echo message="jboss600.home=${jboss600.home}"/>
- <echo message="jboss601.home=${jboss601.home}"/>
+ <echo message="jboss610.home=${jboss610.home}"/>
<echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss710.home=${jboss710.home}"/>
</target>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/pom.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -118,8 +118,7 @@
<artifactId>juddi</artifactId>
<scope>provided</scope>
</dependency>
-
- <!--jboss600-->
+
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600</artifactId>
@@ -136,6 +135,22 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss610</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!--junit-->
<dependency>
<groupId>junit</groupId>
@@ -189,8 +204,8 @@
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss600.txt">
<param name="targetName" expression="jboss600" />
</xslt>
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss601.txt">
- <param name="targetName" expression="jboss601" />
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss610.txt">
+ <param name="targetName" expression="jboss610" />
</xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss700.txt">
<param name="targetName" expression="jboss700" />
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2011-08-17 12:14:24 UTC (rev 14892)
@@ -14,20 +14,20 @@
3.) Execute one of the following
ant deploy-jboss600
- ant deploy-jboss601
+ ant deploy-jboss610
By default the SOAP stack will be installed to 'default' configuration.
If users want to install SOAP stack to different JBossAS configuration then
they have to specify -Djboss.server.instance=foo JVM property.
Supported configurations of the installer are 'default', 'all' and 'standard'.
- ant -Djboss.server.instance=standard deploy-jboss600
+ ant -Djboss.server.instance=standard deploy-jboss610
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-jboss600
+ ant -Dspring=true deploy-jboss610
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/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-08-17 12:14:24 UTC (rev 14892)
@@ -4,12 +4,12 @@
# Optional JBoss Home
jboss600.home=@jboss600.home@
-jboss601.home=@jboss601.home@
+jboss610.home=@jboss610.home@
jboss700.home=@jboss700.home@
jboss710.home=@jboss710.home@
-# The JBoss server under test. This can be [jboss600|jboss601|jboss700|jboss710]
-jbossws.integration.target=jboss601
+# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss710]
+jbossws.integration.target=jboss610
# The JBoss settings
jboss.server.instance=default
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -54,44 +54,44 @@
</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}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
+ <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
</antcall>
</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"
+ modifyjbossintegration="true"
removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] -->
</target>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -28,23 +28,23 @@
<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="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
<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"/>
<property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
- <available property="jboss601.available" file="${jboss601.available.file}"/>
+ <available property="jboss610.available" file="${jboss610.available.file}"/>
<available property="jboss700.available" file="${jboss700.available.file}"/>
<available property="jboss710.available" file="${jboss710.available.file}"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -50,7 +50,7 @@
<condition property="jbossws.integration.jboss60" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
</or>
</condition>
<condition property="jbossws.integration.jboss70" value="true">
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 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -96,6 +96,7 @@
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
<include>org.jboss.ws:jbossws-jboss600:jar</include>
+ <include>org.jboss.ws:jbossws-jboss610:jar</include>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/server/pom.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -290,41 +290,19 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
- <artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <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>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- -->
- <!-- END -->
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
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 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -23,7 +23,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
@@ -33,7 +33,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"
/>
<copy
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -744,20 +744,20 @@
</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.1-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss601</jbossws.integration.target>
+ <jboss.version>6.1.0.Final</jboss.version>
+ <jbossws.integration.target>jboss610</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-depchain</artifactId>
- <scope>import</scope>
+ <scope>test</scope>
<type>pom</type>
<version>${jboss.version}</version>
<exclusions>
@@ -766,7 +766,7 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF (AS 6.0.0) -->
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
<exclusion>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
@@ -787,20 +787,37 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
</exclusion>
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
<exclusion>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-factories</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
+ <artifactId>jbossws-native-jaxrpc</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
+ <artifactId>jbossws-native-saaj</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-management</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
</exclusion>
<exclusion>
@@ -833,7 +850,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <compilerArgument>-Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</compilerArgument>
+ <compilerArgument>-Djava.endorsed.dirs=${jboss610.home}/lib/endorsed</compilerArgument>
</configuration>
<executions>
<execution>
@@ -848,50 +865,50 @@
<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 -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</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 -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
<excludes>
- <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
- <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
+ <!-- # UsernameTestCase requires trustore in jboss-web tomcat configuration-->
+ <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude>
- <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
- <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+ <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
+ <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
- <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+ <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
- <!--# [JBWS-2561] XOP request not properly inlined-->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+ <!--# [JBWS-2561] XOP request not properly inlined-->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
- <!--# [JBWS-2480] Soap attachments are dropped on server response-->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <!--# [JBWS-2480] Soap attachments are dropped on server response-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
- <!--# [JBWS-2397] Fix jbws1797 testcase-->
- <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+ <!--# [JBWS-2397] Fix jbws1797 testcase-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
- <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+ <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
+ <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
- <!--# Seems MSFT interop. endpoints are down :(-->
- <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
+ <!--# Seems MSFT interop. endpoints are down :(-->
+ <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
- <!-- # [JBWS-3205] JDKLogManager not used -->
- <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
+ <!-- # [JBWS-3205] JDKLogManager not used -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
- <!-- # [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
+ <!-- # [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
- <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
+ <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only -->
+ <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
</excludes>
</configuration>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-08-17 10:54:00 UTC (rev 14891)
+++ stack/cxf/trunk/pom.xml 2011-08-17 12:14:24 UTC (rev 14892)
@@ -51,14 +51,9 @@
<jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
- -->
- <!-- END -->
+ <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
<jboss700.version>7.0.0.Final</jboss700.version>
- <cxf.version>2.4.2-SNAPSHOT</cxf.version>
+ <cxf.version>2.4.3-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
@@ -141,28 +136,23 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss700.version}</version>
- </dependency>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <version>${jbossws.jboss610.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss601.version}</version>
+ <artifactId>jbossws-jboss610</artifactId>
+ <version>${jbossws.jboss610.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
- <!-- END -->
<dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-webservices-tests-integration</artifactId>
+ <version>${jboss700.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws.projects</groupId>
<artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
<version>${jaxws-jboss-httpserver-httpspi.version}</version>
@@ -1290,14 +1280,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>
More information about the jbossws-commits
mailing list