Return-Path: 
 <scm-return-19713-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 87163 invoked from network); 16 May 2007 15:00:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 May 2007 15:00:28 -0000
Received: (qmail 80017 invoked by uid 500); 16 May 2007 15:00:34 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 80009 invoked by uid 500); 16 May 2007 15:00:34 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 79998 invoked by uid 99); 16 May 2007 15:00:34 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 May 2007 08:00:34 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 May 2007 08:00:27 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8D7641A9838; Wed, 16 May 2007 08:00:06 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r538622 - in /geronimo/server/trunk: ./
 configs/axis2-deployer/src/plan/ configs/axis2/
 modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/
 modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservic...
Date: Wed, 16 May 2007 15:00:06 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070516150006.8D7641A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Wed May 16 08:00:05 2007
New Revision: 538622

URL: http://svn.apache.org/viewvc?view=rev&rev=538622
Log:
GERONIMO-3124 Switch Axis2 stack back to axis2-saaj from Sun SAAJ Impl

Modified:
    geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/axis2/pom.xml
    geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2BuilderUtil.java
    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=538622&r1=538621&r2=538622
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml Wed May 16 08:00:05 2007
@@ -92,8 +92,16 @@
                         <artifactId>axis2-metadata</artifactId>
                     </dependency>
                     <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-saaj</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.httpcomponents</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=538622&r1=538621&r2=538622
==============================================================================
--- geronimo/server/trunk/configs/axis2/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2/pom.xml Wed May 16 08:00:05 2007
@@ -107,12 +107,20 @@
             <artifactId>axis2-metadata</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-saaj</artifactId>
+        </dependency>
+        <dependency>
              <groupId>org.apache.httpcomponents</groupId>
              <artifactId>jakarta-httpcore</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-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=538622&r1=538621&r2=538622
==============================================================================
--- 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 Wed May 16 08:00:05 2007
@@ -52,7 +52,6 @@
     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) 
@@ -69,11 +68,10 @@
         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());
          
         return jars.toArray(new URL[jars.size()]);

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=538622&r1=538621&r2=538622
==============================================================================
--- 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 May 16 08:00:05 2007
@@ -33,10 +33,10 @@
                                           "org.apache.axis.soap.SOAPConnectionFactoryImpl",
                                           "org.apache.axis.soap.SAAJMetaFactoryImpl"));
         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"));
+                           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(),
                            createSAAJInfo("com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl", 
                                           "com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl",

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=538622&r1=538621&r2=538622
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed May 16 08:00:05 2007
@@ -1368,6 +1368,12 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-saaj</artifactId>
+                <version>${axis2Version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>jakarta-httpcore</artifactId>
                 <version>4.0-alpha4</version>
@@ -1388,6 +1394,18 @@
             <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>