Author: alessio.soldano(a)jboss.com
Date: 2011-04-05 09:15:05 -0400 (Tue, 05 Apr 2011)
New Revision: 14006
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
Log:
[JBPAPP-6249] Adding endorsed module for building jbossws-cxf-factories.jar which is to be
installed in lib/endorsed for overwriting the jaxws provider setup
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/cxf/trunk:12339
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2011-04-05 07:05:48 UTC
(rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2011-04-05 13:15:05 UTC
(rev 14006)
@@ -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/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-04-05
07:05:48 UTC (rev 14005)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-04-05
13:15:05 UTC (rev 14006)
@@ -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/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05
07:05:48 UTC (rev 14005)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05
13:15:05 UTC (rev 14006)
@@ -1 +0,0 @@
-org.apache.cxf.jaxws.spi.ProviderImpl
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml 2011-04-05 13:15:05 UTC
(rev 14006)
@@ -1,16 +0,0 @@
-<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>
Copied: stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml (from rev 12339,
stack/cxf/trunk/modules/endorsed/pom.xml)
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml
(rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/pom.xml 2011-04-05 13:15:05 UTC
(rev 14006)
@@ -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.1.2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+</project>
Deleted:
stack/cxf/branches/jbossws-cxf-3.1.2/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 2010-05-26
11:32:04 UTC (rev 12339)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-04-05
13:15:05 UTC (rev 14006)
@@ -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
Copied:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
(from rev 12339,
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin)
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
(rev 0)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2011-04-05
13:15:05 UTC (rev 14006)
@@ -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
Deleted:
stack/cxf/branches/jbossws-cxf-3.1.2/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 2010-05-26
11:32:04 UTC (rev 12339)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05
13:15:05 UTC (rev 14006)
@@ -1 +0,0 @@
-org.apache.cxf.jaxws.spi.ProviderImpl
Copied:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
(from rev 12339,
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider)
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
(rev 0)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2011-04-05
13:15:05 UTC (rev 14006)
@@ -0,0 +1 @@
+org.apache.cxf.jaxws.spi.ProviderImpl
Property changes on:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/all-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/default-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-05
07:05:48 UTC (rev 14005)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-05
13:15:05 UTC (rev 14006)
@@ -62,6 +62,7 @@
<patternset id="jbossws.lib.endorsed.patternset">
<include name="**/jaxb-api.jar"/>
+ <include name="**/jbossws-cxf-factories.jar"/>
</patternset>
<patternset id="jbossws.server.lib.patternset">
@@ -78,6 +79,7 @@
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
+ <include name="**/jbossws-cxf-factories.jar"/>
<include name="**/jbossws-cxf-server*.jar"/>
<include name="**/jdom.jar"/>
<include name="**/neethi.jar"/>
@@ -93,7 +95,7 @@
<include name="**/XmlSchema.jar"/>
<include name="**/FastInfoset.jar"/>
</patternset>
-
+
<!-- ================================================================== -->
<!-- Deploy Bin -->
<!-- ================================================================== -->
Property changes on:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/production-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/standard-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/web-deploy-installer.conf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2011-04-05 07:05:48 UTC
(rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2011-04-05 13:15:05 UTC
(rev 14006)
@@ -25,6 +25,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/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2011-04-05 07:05:48 UTC (rev 14005)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2011-04-05 13:15:05 UTC (rev 14006)
@@ -37,6 +37,7 @@
<modules>
<module>modules/server</module>
<module>modules/client</module>
+ <module>modules/endorsed</module>
<module>modules/management</module>
<module>modules/resources</module>
</modules>
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-05
07:05:48 UTC (rev 14005)
+++
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-05
13:15:05 UTC (rev 14006)
@@ -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.jws:jsr181-api:jar</include>
Property changes on:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-