geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r954480 - in /geronimo/server/branches/2.1.6: ./ plugins/j2ee/geronimo-naming-builder/ plugins/tomcat/geronimo-tomcat6-clustering-wadi/ repository/ repository/org/apache/axis2/ repository/org/apache/axis2/axis2-kernel/1.3-G20090406/ reposit...
Date Mon, 14 Jun 2010 14:15:02 GMT
Author: rickmcguire
Date: Mon Jun 14 14:15:02 2010
New Revision: 954480

URL: http://svn.apache.org/viewvc?rev=954480&view=rev
Log:
Upgrade the axis2 and cxf versions

Added:
    geronimo/server/branches/2.1.6/repository/org/apache/axis2/axis2-kernel/1.3-G20100610/
      - copied from r953557, geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20100610/
    geronimo/server/branches/2.1.6/repository/org/apache/axis2/axis2-kernel/1.3-G20100610/axis2-kernel-1.3-G20100610.jar
      - copied unchanged from r953557, geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20100610/axis2-kernel-1.3-G20100610.jar
    geronimo/server/branches/2.1.6/repository/org/apache/axis2/builder.patch
      - copied unchanged from r953557, geronimo/server/branches/2.1/repository/org/apache/axis2/builder.patch
    geronimo/server/branches/2.1.6/repository/org/apache/ws/
      - copied from r953557, geronimo/server/branches/2.1/repository/org/apache/ws/
    geronimo/server/branches/2.1.6/repository/org/apache/ws/axiom_api.patch
      - copied unchanged from r953557, geronimo/server/branches/2.1/repository/org/apache/ws/axiom_api.patch
    geronimo/server/branches/2.1.6/repository/org/apache/ws/commons/
      - copied from r953557, geronimo/server/branches/2.1/repository/org/apache/ws/commons/
    geronimo/server/branches/2.1.6/repository/org/apache/ws/commons/axiom/
      - copied from r953557, geronimo/server/branches/2.1/repository/org/apache/ws/commons/axiom/
    geronimo/server/branches/2.1.6/repository/org/apache/ws/commons/axiom/axiom-api/
      - copied from r953557, geronimo/server/branches/2.1/repository/org/apache/ws/commons/axiom/axiom-api/
    geronimo/server/branches/2.1.6/repository/org/apache/ws/commons/axiom/axiom-api/1.2.5-20100610/
      - copied from r953557, geronimo/server/branches/2.1/repository/org/apache/ws/commons/axiom/axiom-api/1.2.5-20100610/
    geronimo/server/branches/2.1.6/repository/org/apache/ws/commons/axiom/axiom-api/1.2.5-20100610/axiom-api-1.2.5-20100610.jar
      - copied unchanged from r953557, geronimo/server/branches/2.1/repository/org/apache/ws/commons/axiom/axiom-api/1.2.5-20100610/axiom-api-1.2.5-20100610.jar
    geronimo/server/branches/2.1.6/repository/org/apache/ws/readme.txt
      - copied unchanged from r953557, geronimo/server/branches/2.1/repository/org/apache/ws/readme.txt
Removed:
    geronimo/server/branches/2.1.6/repository/org/apache/axis2/axis2-kernel/1.3-G20090406/
Modified:
    geronimo/server/branches/2.1.6/   (props changed)
    geronimo/server/branches/2.1.6/plugins/j2ee/geronimo-naming-builder/   (props changed)
    geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-wadi/   (props
changed)
    geronimo/server/branches/2.1.6/pom.xml
    geronimo/server/branches/2.1.6/repository/org/apache/axis2/README.TXT
    geronimo/server/branches/2.1.6/repository/pom.xml

Propchange: geronimo/server/branches/2.1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 14 14:15:02 2010
@@ -1,2 +1,3 @@
+/geronimo/server/branches/2.1:953246-953557
 /geronimo/server/branches/2.1.4:756973
 /geronimo/server/trunk:695597,695602

Propchange: geronimo/server/branches/2.1.6/plugins/j2ee/geronimo-naming-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 14 14:15:02 2010
@@ -1,2 +1,3 @@
+/geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder:953246-953557
 /geronimo/server/branches/2.1.4/plugins/j2ee/geronimo-naming-builder:756973
 /geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder:695597,695602,758570

Propchange: geronimo/server/branches/2.1.6/plugins/tomcat/geronimo-tomcat6-clustering-wadi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 14 14:15:02 2010
@@ -1,2 +1,3 @@
+/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi:953246-953557
 /geronimo/server/branches/2.1.4/plugins/tomcat/geronimo-tomcat6-clustering-wadi:756973
 /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi:695597,695602,774775-775575

Modified: geronimo/server/branches/2.1.6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/pom.xml?rev=954480&r1=954479&r2=954480&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/pom.xml (original)
+++ geronimo/server/branches/2.1.6/pom.xml Mon Jun 14 14:15:02 2010
@@ -86,7 +86,7 @@
         <eclipseVersion>3.3.0-v_771</eclipseVersion>
         <dojoVersion>1.0.2</dojoVersion>
         <dojoLegacyVersion>0.4.3</dojoLegacyVersion>
-        <cxfVersion>2.0.12</cxfVersion>
+        <cxfVersion>2.0.13</cxfVersion>
         <axis2Version>1.3</axis2Version>
         <axiomVersion>1.2.5</axiomVersion>
         <springVersion>2.5.6</springVersion>
@@ -1414,7 +1414,7 @@
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-kernel</artifactId>
-                <version>1.3-G20090406</version>
+                <version>1.3-G20100610</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.woden</groupId>
@@ -1462,7 +1462,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-api</artifactId>
-                <version>${axiomVersion}</version>
+                <version>1.2.5-20100610</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>

Modified: geronimo/server/branches/2.1.6/repository/org/apache/axis2/README.TXT
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/repository/org/apache/axis2/README.TXT?rev=954480&r1=954479&r2=954480&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/repository/org/apache/axis2/README.TXT (original)
+++ geronimo/server/branches/2.1.6/repository/org/apache/axis2/README.TXT Mon Jun 14 14:15:02
2010
@@ -3,7 +3,7 @@ Private Build of Axis2 1.3 for Geronimo.
 How to build Axis2 1.3-G20090406:
 ---------------------------------
  Checkout the Axis2 1.3 tag
-   svn co http://svn.apache.org/repos/asf/webservices/axis2/tags/java/v1.3/ axis2-1.3
+   svn co http://svn.apache.org/repos/asf/axis/axis2/java/core/tags/java/v1.3
   
 
 Apply the patches
@@ -14,6 +14,7 @@ Apply the patches
  patch -p0 -i metadata.patch
  patch -p0 -i jaxws.patch
  patch -p0 -i kernel.patch
+ patch -p0 -i builder.patch
 
 Build Axis2 1.3
 ---------------
@@ -32,6 +33,7 @@ Patch Information
  metadata.patch - contains fixes for SEI with overloaded methods
  jaxws.patch    - contains fixes for AXIS2-3343 and RESTful invocations
  kernel.patch   - contains fixes for AXIS2-4279
+ builder.patch  - contains fixes for AXIS2-4450
 
 Copy patched jar files to appropriate locations
 -----------------------------------------------
@@ -39,4 +41,4 @@ Copy patched jar files to appropriate lo
   cp modules/saaj/target/axis2-saaj-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-saaj/1.3-G20090406/axis2-saaj-1.3-G20090406.jar
   cp modules/metadata/target/axis2-metadata-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-metadata/1.3-G20090406/axis2-metadata-1.3-G20090406.jar
   cp modules/jaxws/target/axis2-jaxws-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-jaxws/1.3-G20090406/axis2-jaxws-1.3-G20090406.jar
-  cp modules/kernel/target/axis2-kernel-1.3.jar  <geronimo-root>/repository/org/apache/axis2/axis2-kernel/1.3-G20090406/axis2-kernel-1.3-G20090406.jar
+  cp modules/kernel/target/axis2-kernel-1.3.jar  <geronimo-root>/repository/org/apache/axis2/axis2-kernel/1.3-G20100610/axis2-kernel-1.3-G20100610.jar

Modified: geronimo/server/branches/2.1.6/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.6/repository/pom.xml?rev=954480&r1=954479&r2=954480&view=diff
==============================================================================
--- geronimo/server/branches/2.1.6/repository/pom.xml (original)
+++ geronimo/server/branches/2.1.6/repository/pom.xml Mon Jun 14 14:15:02 2010
@@ -158,6 +158,12 @@
             <artifactId>axis2-kernel</artifactId>
         </dependency>
 
+        <!-- Axiom -->
+        <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-api</artifactId>
+        </dependency>
+
     </dependencies>
 
     <repositories>



Mime
View raw message