Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 07:32:04 -0400 (Wed, 26 May 2010)
New Revision: 12339
Added:
stack/cxf/trunk/modules/endorsed/
stack/cxf/trunk/modules/endorsed/pom.xml
stack/cxf/trunk/modules/endorsed/src/
stack/cxf/trunk/modules/endorsed/src/main/
stack/cxf/trunk/modules/endorsed/src/main/resources/
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2844] Adding endorse module for forcing cxf jaxws impl
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -24,6 +24,11 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
Deleted:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
---
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-26
11:09:14 UTC (rev 12338)
+++
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-26
11:32:04 UTC (rev 12339)
@@ -1,4 +0,0 @@
-com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
-com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
-com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
-com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
Deleted:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
===================================================================
---
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-05-26
11:09:14 UTC (rev 12338)
+++
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-05-26
11:32:04 UTC (rev 12339)
@@ -1 +0,0 @@
-org.apache.cxf.jaxws.spi.ProviderImpl
Added: stack/cxf/trunk/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml (rev 0)
+++ stack/cxf/trunk/modules/endorsed/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -0,0 +1,16 @@
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Endorsed JAX-WS factories</name>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+</project>
Property changes on: stack/cxf/trunk/modules/endorsed/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
---
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
(rev 0)
+++
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-26
11:32:04 UTC (rev 12339)
@@ -0,0 +1,4 @@
+com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
+com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
+com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
+com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
Added:
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
===================================================================
---
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
(rev 0)
+++
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-05-26
11:32:04 UTC (rev 12339)
@@ -0,0 +1 @@
+org.apache.cxf.jaxws.spi.ProviderImpl
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-26
11:09:14 UTC (rev 12338)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-26
11:32:04 UTC (rev 12339)
@@ -71,6 +71,7 @@
<include name="**/jaxb-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/stax-api.jar"/>
+ <include name="**/jbossws-cxf-factories.jar"/>
</patternset>
<patternset id="jbossws.server.lib.patternset">
@@ -105,6 +106,7 @@
<patternset id="jbossws.service.lib.patternset">
<include name="**/jbossws-cxf-client*.jar"/>
+ <include name="**/jbossws-cxf-factories.jar"/>
<include name="**/jbossws-cxf-server*.jar"/>
</patternset>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -35,6 +35,11 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -38,6 +38,7 @@
<modules>
<module>modules/server</module>
<module>modules/client</module>
+ <module>modules/endorsed</module>
<module>modules/management</module>
<module>modules/resources</module>
</modules>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-26 11:09:14 UTC
(rev 12338)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-26 11:32:04 UTC
(rev 12339)
@@ -22,6 +22,7 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
+ <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
<include>javax.xml.bind:jaxb-api:jar</include>