[jbossws-commits] JBossWS SVN: r12134 - in stack/cxf/trunk: modules/management and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Apr 30 10:21:29 EDT 2010
Author: richard.opalka at jboss.com
Date: 2010-04-30 10:21:28 -0400 (Fri, 30 Apr 2010)
New Revision: 12134
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/pom.xml
stack/cxf/trunk/profiles.xml.example
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switching to AS 600 M3 and updating excludes files
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2010-04-30 14:11:10 UTC (rev 12133)
+++ stack/cxf/trunk/modules/management/pom.xml 2010-04-30 14:21:28 UTC (rev 12134)
@@ -39,14 +39,14 @@
<artifactId>jbossws-jboss510</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600M2</artifactId>
<scope>provided</scope>
</dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</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 2010-04-30 14:11:10 UTC (rev 12133)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-04-30 14:21:28 UTC (rev 12134)
@@ -35,9 +35,14 @@
file="${src.dir}/jbossws-cxf-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
-
+
<copy
file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
+ tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
+
+ <copy
+ file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2010-04-30 14:11:10 UTC (rev 12133)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-04-30 14:21:28 UTC (rev 12134)
@@ -26,7 +26,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<asm.version>2.2.3</asm.version>
- <hornetq.version>2.1.0.BETA1</hornetq.version>
+ <hornetq.version>2.1.0.BETA3</hornetq.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
</properties>
@@ -442,7 +442,7 @@
<profile>
<id>jboss600</id>
<properties>
- <jboss.version>6.0.0.20100216-M2</jboss.version>
+ <jboss.version>6.0.0.20100429-M3</jboss.version>
<jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
@@ -453,14 +453,54 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-security</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -553,11 +593,6 @@
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
- <artifactId>hornetq-transports</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
<artifactId>hornetq-jms-client</artifactId>
<version>${hornetq.version}</version>
</dependency>
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 14:11:10 UTC (rev 12133)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 14:21:28 UTC (rev 12134)
@@ -45,20 +45,14 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-2917] We're using buggy xalan version causing namespaces issues
-org/jboss/test/ws/jaxws/jbws2917/**
+# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
org/jboss/test/ws/jaxws/jbws2937/**
org/jboss/test/ws/jaxws/jbws2942/**
-org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*
-
-# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3
-org/jboss/test/ws/jaxrpc/**
-
-# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
org/jboss/test/ws/jaxws/jbws2960/**
org/jboss/test/ws/jaxws/jbws2985/**
org/jboss/test/ws/jaxws/jbws2991/**
org/jboss/test/ws/jaxws/jbws3008/**
+org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-04-30 14:11:10 UTC (rev 12133)
+++ stack/cxf/trunk/pom.xml 2010-04-30 14:21:28 UTC (rev 12134)
@@ -49,10 +49,10 @@
<jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version>
<jbossws.jboss501.version>3.3.0-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.3.0-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
+ <jbossws.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version>
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
@@ -133,6 +133,9 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <!-- JBWS-2505 -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600M2</artifactId>
@@ -145,9 +148,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2010-04-30 14:11:10 UTC (rev 12133)
+++ stack/cxf/trunk/profiles.xml.example 2010-04-30 14:21:28 UTC (rev 12134)
@@ -13,7 +13,7 @@
<properties>
<jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home>
- <jboss600.home>/opt/svn/jbossas/tags/JBoss_6_0_0_20100216-M2/build/target/jboss-6.0.0.20100216-M2</jboss600.home>
+ <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3</jboss600.home>
<jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home>
</properties>
</profile>
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-04-30 14:11:10 UTC (rev 12133)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-04-30 14:21:28 UTC (rev 12134)
@@ -93,12 +93,12 @@
<target name="deploy-structure-jboss600" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf" inheritall="false">
+ <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="true"/><!-- [JBWS-2505] -->
+ <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -122,7 +122,7 @@
<target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
<fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true" removenativecore="true" /><!-- [JBWS-2505][JBWS-2895] -->
+ <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false" removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] -->
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 14:11:10 UTC (rev 12133)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 14:21:28 UTC (rev 12134)
@@ -122,6 +122,9 @@
<include>org.jboss.ws:jbossws-jboss510:jar</include>
</includes>
</dependencySet>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
@@ -132,9 +135,6 @@
<include>org.jboss.ws:jbossws-jboss600M2:jar</include>
</includes>
</dependencySet>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
More information about the jbossws-commits
mailing list