You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2010/01/25 10:50:13 UTC
svn commit: r902753 - in /geronimo/server/trunk: ./ plugins/cxf/
plugins/cxf/cxf/ plugins/cxf/cxf/src/main/history/
plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/
plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/o...
Author: rwonly
Date: Mon Jan 25 09:50:12 2010
New Revision: 902753
URL: http://svn.apache.org/viewvc?rev=902753&view=rev
Log:
GERONIMO-5016: 1. make cxf & geronimo-cxf can be compiled 2. refactor the package name in geronimo-cxf-ejb-builder to avoid split package issue.
Added:
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/
- copied from r901955, geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/
Removed:
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/
Modified:
geronimo/server/trunk/plugins/cxf/cxf/pom.xml
geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
geronimo/server/trunk/plugins/cxf/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=902753&r1=902752&r2=902753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Mon Jan 25 09:50:12 2010
@@ -46,13 +46,6 @@
<scope>provided</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>j2ee-server</artifactId>-->
- <!--<type>car</type>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>server-security-config</artifactId>
@@ -75,23 +68,18 @@
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
-
+
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
</dependency>
<dependency>
@@ -100,66 +88,6 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-xml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-jaxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=902753&r1=902752&r2=902753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Mon Jan 25 09:50:12 2010
@@ -7,88 +7,88 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-xml</artifactId>
+ <artifactId>cxf-bundle-minimal</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>transaction-1_6</artifactId>
+ <type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-jaxb</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>webservices-common</artifactId>
+ <type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>server-security-config</artifactId>
+ <type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-cxf</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jaxws</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>spring</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction-1_6</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>webservices-common</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-cxf</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -97,33 +97,38 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java?rev=902753&r1=901955&r2=902753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java Mon Jan 25 09:50:12 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.cxf.builder;
+package org.apache.geronimo.cxf.ejb.builder;
import java.util.Collection;
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml?rev=902753&r1=902752&r2=902753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml Mon Jan 25 09:50:12 2010
@@ -46,32 +46,38 @@
<artifactId>geronimo-jaxws</artifactId>
<version>${version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction-1_6</artifactId>
<version>${version}</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-minimal</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/pom.xml?rev=902753&r1=902752&r2=902753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/pom.xml Mon Jan 25 09:50:12 2010
@@ -52,312 +52,243 @@
<dependencyManagement>
<dependencies>
- <!-- CXF Plugin -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
+ <artifactId>cxf-bundle-minimal</artifactId>
<version>${cxfVersion}</version>
<exclusions>
+ <!-- transitive dependency
+
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.5</version>
+
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>2.0.4</version>
+
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.4.3</version>
+
+
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
+
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
+
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1.1</version>
+
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <version>1.0</version>
+
+ -->
+
+ <!-- geronimo specs,
+ their versions are not the same with those in root pom -->
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-schemas</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-metacode</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
+
+ <!-- Spring jars,
+ org.springframework*;resolution:=optional, -->
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-xml</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-dao</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
+
+ <!-- Jetty jars
+ org.mortbay*;resolution:=optional, -->
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
</exclusion>
+
+ <!-- commons jars,
+ org.apache.commons.lang*;resolution:=optional,
+ org.apache.commons.codec*;resolution:=optional, -->
<exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
</exclusion>
+
+ <!-- sun jars -->
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
</exclusion>
+
+ <!-- xml jars
+ ..
+ org.jaxen*;resolution:=optional,
+ org.jdom*;resolution:=optional,
+ org.apache.xmlbeans*;resolution:=optional, -->
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.parsers</groupId>
- <artifactId>jaxp-ri</artifactId>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-simple</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
</exclusion>
+
+ <!-- others -->
<exclusion>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
</exclusion>
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </exclusion>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
+ <!-- not a bundle -->
<exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
</exclusion>
- <!-- New excludes for org.apache.velocity -->
+
+ <!-- runtime jars -->
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
</exclusion>
+
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-java2ws</artifactId>
- <version>${cxfVersion}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
+ <version>1.4.3_2</version>
<exclusions>
<exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-javascript</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-aegis</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- <version>${cxfVersion}</version>
- </dependency>
-
-
- </dependencies>
+ </dependencies>
</dependencyManagement>
</project>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=902753&r1=902752&r2=902753&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Jan 25 09:50:12 2010
@@ -251,7 +251,12 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>1.1.3-SNAPSHOT</version>
+ </dependency>
<!--
NOTE: The full source for this artifact is private due to Sun licensing issues.
To view the generated XmlBeans source please see the -src artifact in the repository:
@@ -1930,35 +1935,14 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>${cxfVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+<!--
+only found in cxf
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>1.43</version>
</dependency>
+-->
<dependency>
<groupId>org.apache.velocity</groupId>