You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by di...@apache.org on 2007/04/19 04:18:51 UTC
svn commit: r530234 - in /geronimo/server/trunk:
configs/axis2-deployer/src/plan/plan.xml configs/axis2/pom.xml
modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/saaj/SAAJFactoryFinder.java
pom.xml
Author: dims
Date: Wed Apr 18 19:18:50 2007
New Revision: 530234
URL: http://svn.apache.org/viewvc?view=rev&rev=530234
Log:
Switch Axis2 over to sun's saaj jars as well. Once we stabilize, we can switch back to see what breaks with Axis2's saaj impl jars
Modified:
geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/axis2/pom.xml
geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/saaj/SAAJFactoryFinder.java
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml?view=diff&rev=530234&r1=530233&r2=530234
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml Wed Apr 18 19:18:50 2007
@@ -83,19 +83,11 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-metadata</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
Modified: geronimo/server/trunk/configs/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2/pom.xml?view=diff&rev=530234&r1=530233&r2=530234
==============================================================================
--- geronimo/server/trunk/configs/axis2/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2/pom.xml Wed Apr 18 19:18:50 2007
@@ -110,19 +110,11 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-metadata</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
Modified: geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/saaj/SAAJFactoryFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/saaj/SAAJFactoryFinder.java?view=diff&rev=530234&r1=530233&r2=530234
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/saaj/SAAJFactoryFinder.java (original)
+++ geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/saaj/SAAJFactoryFinder.java Wed Apr 18 19:18:50 2007
@@ -32,12 +32,12 @@
"org.apache.axis.soap.SOAPFactoryImpl",
"org.apache.axis.soap.SOAPConnectionFactoryImpl",
"org.apache.axis.soap.SAAJMetaFactoryImpl"));
- SAAJ_FACTORIES.put(SAAJUniverse.Type.AXIS2.toString(),
- createSAAJInfo("org.apache.axis2.saaj.MessageFactoryImpl",
- "org.apache.axis2.saaj.SOAPFactoryImpl",
- "org.apache.axis2.saaj.SOAPConnectionFactoryImpl",
- "org.apache.axis2.saaj.SAAJMetaFactoryImpl"));
- SAAJ_FACTORIES.put(SAAJUniverse.Type.SUN.toString(),
+ SAAJ_FACTORIES.put(SAAJUniverse.Type.AXIS2.toString(),
+ createSAAJInfo("com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl",
+ "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl",
+ "com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory",
+ "com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl"));
+ SAAJ_FACTORIES.put(SAAJUniverse.Type.SUN.toString(),
createSAAJInfo("com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl",
"com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl",
"com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory",
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=530234&r1=530233&r2=530234
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Apr 18 19:18:50 2007
@@ -84,7 +84,9 @@
<dojoVersion>0.4.1</dojoVersion>
<cxfVersion>2.0-incubator-RC-SNAPSHOT</cxfVersion>
- </properties>
+
+ <axis2Version>SNAPSHOT</axis2Version>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -174,7 +176,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
@@ -1322,43 +1324,37 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-metadata</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj</artifactId>
- <version>SNAPSHOT</version>
+ <version>${axis2Version}</version>
</dependency>
<dependency>
@@ -1376,18 +1372,6 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.3</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
<version>1.2.3</version>
<exclusions>
<exclusion>