1:16 a.m.
Author: ropalka
Date: 2012-02-25 02:16:57 -0500 (Sat, 25 Feb 2012)
New Revision: 15742
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
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/build-deploy.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Merged revisions 15738 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15738 | alessio.soldano(a)jboss.com | 2012-02-24 17:41:02 +0100 (Fri, 24 Feb 2012) | 2
lines
Adding ASIL 710
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
-
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719,15723-15730
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738
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-02-25 07:12:09 UTC (rev
15741)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-02-25 07:16:57 UTC (rev
15742)
@@ -45,6 +45,13 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-resources</artifactId>
+ <version>${project.version}</version>
+ <classifier>jboss710</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-server</artifactId>
<version>${project.version}</version>
</dependency>
@@ -154,6 +161,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss710</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!--junit-->
<dependency>
<groupId>junit</groupId>
@@ -255,6 +268,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss710</artifactId>
+ <classifier>tests-integration</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
<scope>provided</scope>
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-02-25
07:12:09 UTC (rev 15741)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-25
07:16:57 UTC (rev 15742)
@@ -152,7 +152,7 @@
<target name="undeploy-jboss710" depends="target-jboss710,init"
description="Remove jbossws from jboss710">
<fail message="Not available: ${jboss710.available.file}"
unless="jboss710.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss710.home}"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss710.home}"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-25
07:12:09 UTC (rev 15741)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-25
07:16:57 UTC (rev 15742)
@@ -77,6 +77,7 @@
<include>org.jboss.ws:jbossws-common-tools:jar</include>
<include>org.jboss.ws:jbossws-jboss701:jar</include>
<include>org.jboss.ws:jbossws-jboss702:jar</include>
+ <include>org.jboss.ws:jbossws-jboss710:jar</include>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
@@ -110,6 +111,17 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<includes>
+
<include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
+ <scope>provided</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
<include>org.jboss.ws:jbossws-shared-testsuite:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
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-02-25 07:12:09 UTC
(rev 15741)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-02-25 07:16:57 UTC
(rev 15742)
@@ -45,6 +45,7 @@
<excludes>
<exclude>**/jbossws-jboss701/**</exclude>
<exclude>**/jbossws-jboss702/**</exclude>
+ <exclude>**/jbossws-jboss710/**</exclude>
</excludes>
</configuration>
</execution>
@@ -66,6 +67,15 @@
<classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss702/jbossws.beans</classesDirectory>
</configuration>
</execution>
+ <execution>
+ <id>jboss710</id>
+ <goals><goal>jar</goal></goals>
+ <phase>package</phase>
+ <configuration>
+ <classifier>jboss710</classifier>
+
<classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-25 07:12:09 UTC (rev 15741)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-25 07:16:57 UTC (rev 15742)
@@ -66,6 +66,7 @@
<jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
+ <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version>
<jboss701.version>7.0.1.Final</jboss701.version>
<jboss702.version>7.0.2.Final</jboss702.version>
<jboss710.version>7.1.0.Final</jboss710.version>
@@ -169,12 +170,21 @@
<version>${jbossws.jboss702.version}</version>
<classifier>tests-integration</classifier>
</dependency>
- <!-- TODO Move dependency below to jboss711.version and add dependency on
org.jboss.ws:jbossws-jboss710:${jbossws.jboss710.version}
- when 710 container integration is needed and created -->
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss710</artifactId>
+ <version>${jbossws.jboss710.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss710</artifactId>
+ <version>${jbossws.jboss710.version}</version>
+ <classifier>tests-integration</classifier>
+ </dependency>
+ <dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
- <version>${jboss710.version}</version>
+ <version>${jboss711.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.projects</groupId>