Reminder: Switch Axis2 stack back to axis2-saaj from Sun SAAJ Impl
-------------------------------------------------------------------
Key: GERONIMO-3124
URL: https://issues.apache.org/jira/browse/GERONIMO-3124
Project: Geronimo
Issue Type: Bug
Security Level: public (Regular issues)
Components: webservices
Affects Versions: Wish List
Reporter: Donald Woods
Assigned To: Davanum Srinivas
Priority: Minor
Fix For: Wish List
This is a placeholder, so we don't forget to rollback the temporary changes
made to use the Sun SAAJ Impl instead of the axis2-saaj jar.
Most of the following changes will have to be rolled back - Revisions 530234,
531260
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
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>
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>
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",
Author: dims
Date: Sun Apr 22 13:06:18 2007
New Revision: 531260
URL: http://svn.apache.org/viewvc?view=rev&rev=531260
Log:
forgot to switch from axis2-saaj to saajri jar
Modified:
geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2BuilderUtil.java
Modified:
geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2BuilderUtil.java
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2BuilderUtil.java?view=diff&rev=531260&r1=531259&r2=531260
==============================================================================
---
geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2BuilderUtil.java
(original)
+++
geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2BuilderUtil.java
Sun Apr 22 13:06:18 2007
@@ -52,6 +52,7 @@
private final static Artifact GERONIMO_ACTIVATION_SPEC_ARTIFACT = new
Artifact("org.apache.geronimo.specs","geronimo-activation_1.1_spec",
(Version)null, "jar");
private final static Artifact GERONIMO_ANNOTATION_ARTIFACT = new
Artifact("org.apache.geronimo.specs","geronimo-annotation_1.0_spec",
(Version)null, "jar");
private final static Artifact GERONIMO_WS_METADATA_ARTIFACT = new
Artifact("org.apache.geronimo.specs","geronimo-ws-metadata_2.0_spec",
(Version)null, "jar");
+ private final static Artifact SAAJRI_IMPL_ARTIFACT = new
Artifact("com.sun.xml.messaging.saaj","saaj-impl", (Version)null, "jar");
private final static String TOOLS = "tools.jar";
protected static URL[] getWsgenClasspath(DeploymentContext context)
@@ -68,10 +69,11 @@
jars.add(getLocation(repositories, JAXWS_RT_ARTIFACT));
jars.add(getLocation(repositories, AXIS2_JAXWS_API_ARTIFACT));
jars.add(getLocation(repositories, AXIS2_SAAJ_API_ARTIFACT));
- jars.add(getLocation(repositories, AXIS2_SAAJ_ARTIFACT));
+// jars.add(getLocation(repositories, AXIS2_SAAJ_ARTIFACT));
jars.add(getLocation(repositories, GERONIMO_ACTIVATION_SPEC_ARTIFACT));
jars.add(getLocation(repositories, GERONIMO_ANNOTATION_ARTIFACT));
jars.add(getLocation(repositories, GERONIMO_WS_METADATA_ARTIFACT));
+ jars.add(getLocation(repositories, SAAJRI_IMPL_ARTIFACT));
jars.add(new File(getToolsJarLoc()).toURL());
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
