geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r762446 - in /geronimo/server/branches/2.1: ./ repository/org/apache/axis2/ repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/ repository/org/apache/axis2/axis2-jaxws/1.3-G20090406/ repository/org/apache/axis2/axis2-kernel/1.3-G20090325...
Date Mon, 06 Apr 2009 18:14:32 GMT
Author: gawor
Date: Mon Apr  6 18:14:31 2009
New Revision: 762446

URL: http://svn.apache.org/viewvc?rev=762446&view=rev
Log:
regenerated Axis2 jar files with another fix for handling overloaded methods (GERONIMO-4614)

Added:
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090406/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090406/axis2-jaxws-1.3-G20090406.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090406/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090406/axis2-kernel-1.3-G20090406.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090406/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090406/axis2-metadata-1.3-G20090406.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090406/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090406/axis2-saaj-1.3-G20090406.jar
  (with props)
Removed:
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090325/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090325/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090325/
Modified:
    geronimo/server/branches/2.1/pom.xml
    geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT
    geronimo/server/branches/2.1/repository/org/apache/axis2/metadata.patch

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=762446&r1=762445&r2=762446&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Mon Apr  6 18:14:31 2009
@@ -1384,7 +1384,7 @@
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-kernel</artifactId>
-                <version>1.3-G20090325</version>
+                <version>1.3-G20090406</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.woden</groupId>
@@ -1408,19 +1408,19 @@
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-jaxws</artifactId>
-                <version>1.3-G20090325</version>
+                <version>1.3-G20090406</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-metadata</artifactId>
-                <version>1.3-G20090325</version>
+                <version>1.3-G20090406</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-saaj</artifactId>
-                <version>1.3-G20090325</version>
+                <version>1.3-G20090406</version>
             </dependency>
 
             <dependency>

Modified: geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT?rev=762446&r1=762445&r2=762446&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT (original)
+++ geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT Mon Apr  6 18:14:31
2009
@@ -1,6 +1,6 @@
 Private Build of Axis2 1.3 for Geronimo.   
 
-How to build Axis2 1.3-G20090325:
+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
@@ -36,7 +36,7 @@
 Copy patched jar files to appropriate locations
 -----------------------------------------------
   cd axis2-1.3
-  cp modules/saaj/target/axis2-saaj-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-saaj/1.3-G20090325/axis2-saaj-1.3-G20090325.jar
-  cp modules/metadata/target/axis2-metadata-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-metadata/1.3-G20090325/axis2-metadata-1.3-G20090325.jar
-  cp modules/jaxws/target/axis2-jaxws-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/axis2-jaxws-1.3-G20090325.jar
-  cp modules/kernel/target/axis2-kernel-1.3.jar  <geronimo-root>/repository/org/apache/axis2/axis2-kernel/1.3-G20090325/axis2-kernel-1.3-G20090325.jar
+  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

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090406/axis2-jaxws-1.3-G20090406.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090406/axis2-jaxws-1.3-G20090406.jar?rev=762446&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090406/axis2-jaxws-1.3-G20090406.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090406/axis2-jaxws-1.3-G20090406.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090406/axis2-kernel-1.3-G20090406.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090406/axis2-kernel-1.3-G20090406.jar?rev=762446&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090406/axis2-kernel-1.3-G20090406.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090406/axis2-kernel-1.3-G20090406.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090406/axis2-metadata-1.3-G20090406.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090406/axis2-metadata-1.3-G20090406.jar?rev=762446&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090406/axis2-metadata-1.3-G20090406.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090406/axis2-metadata-1.3-G20090406.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090406/axis2-saaj-1.3-G20090406.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090406/axis2-saaj-1.3-G20090406.jar?rev=762446&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090406/axis2-saaj-1.3-G20090406.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090406/axis2-saaj-1.3-G20090406.jar
------------------------------------------------------------------------------
    svn:mime-type = application/java-archive

Modified: geronimo/server/branches/2.1/repository/org/apache/axis2/metadata.patch
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/metadata.patch?rev=762446&r1=762445&r2=762446&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/axis2/metadata.patch (original)
+++ geronimo/server/branches/2.1/repository/org/apache/axis2/metadata.patch Mon Apr  6 18:14:31
2009
@@ -1,6 +1,6 @@
 Index: modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
 ===================================================================
---- modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties	(revision 749891)
+--- modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties	(revision 751793)
 +++ modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties	(working copy)
 @@ -182,3 +182,5 @@
  onewayAsync=The async listener property was set.  A one way invocation cannot be performed
using an async response channel.
@@ -10,7 +10,7 @@
 +
 Index: modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
 ===================================================================
---- modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
(revision 749891)
+--- modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
(revision 751793)
 +++ modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
(working copy)
 @@ -987,62 +987,79 @@
          return validDefaultCtor;
@@ -174,3 +174,116 @@
      /*
        * This method verifies that, if there are any WebMethod with exclude == false, then
        * make sure that we find all of those methods represented in the wsdl. However, if
+Index: modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
+===================================================================
+--- modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
(revision 751793)
++++ modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
(working copy)
+@@ -46,6 +46,7 @@
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Modifier;
+ import java.util.ArrayList;
++import java.util.Map;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+@@ -629,9 +630,16 @@
+                 new ArrayList<MethodDescriptionComposite>();
+ 
+         if (dbc.isInterface()) {
++            if(log.isDebugEnabled()) {
++                log.debug("Removing overridden methods for interface: " + dbc.getClassName()
+ 
++                          " with super interface: " + dbc.getSuperClassName());
++            }
++            
++            // make sure we retrieve all the methods, then remove the overridden
++            // methods that exist in the base interface
++            retrieveList = retrieveSEIMethodsChain(dbc);
++            retrieveList = removeOverriddenMethods(retrieveList, dbc);
+ 
+-            retrieveList.addAll(retrieveSEIMethodsChain(dbc));
+-
+         } else {
+             //this is an implied SEI...rules are more complicated
+ 
+@@ -723,6 +731,49 @@
+     }
+ 
+     /**
++     * This method drives the establishment of the hierarchy of interfaces for an SEI.
++     */
++    private Map<String, Integer> getInterfaceHierarchy(DescriptionBuilderComposite
dbc) {
++        if(log.isDebugEnabled()) {
++            log.debug("Getting interface hierarchy for: " + dbc.getClassName());
++        }
++        Map<String, Integer> hierarchyMap = new HashMap<String, Integer>();
++        hierarchyMap.put(dbc.getClassName(), 0);
++        return getInterfaceHierarchy(dbc.getInterfacesList(), 
++                                     hierarchyMap, 
++                                     1);
++    }
++
++    /**
++     * Recursive method that builds the hierarchy of interfaces. This begins with an
++     * SEI and walks all of its super interfaces.
++     */
++    private Map<String, Integer> getInterfaceHierarchy(List<String> interfaces,
++                                                           Map<String, Integer> hierarchyMap,
++                                                           int level) {
++        HashMap<String, DescriptionBuilderComposite> dbcMap = getEndpointDescriptionImpl().
++            getServiceDescriptionImpl().getDBCMap();
++        
++        // walk through all of the interfaces
++        if(interfaces != null
++                &&
++                !interfaces.isEmpty()) {
++            for(String interfaze : interfaces) {
++                DescriptionBuilderComposite interDBC = dbcMap.get(interfaze);
++                if(interDBC != null) {
++                    if(log.isDebugEnabled()) {
++                        log.debug("Inserting super interface " + interDBC.getClassName()
+ 
++                                  " at level " + level);
++                    }
++                    hierarchyMap.put(interDBC.getClassName(), level);
++                    return getInterfaceHierarchy(interDBC.getInterfacesList(), hierarchyMap,
level++);
++                }
++            }
++        }
++        return hierarchyMap;
++    }
++
++    /**
+      * This method will loop through each method that was previously determined as being
relevant to
+      * the current composite. It will then drive the call to determine if this represents
a method
+      * that has been overridden. If it represents an overriding method declaration it will
remove
+@@ -735,7 +786,7 @@
+     private ArrayList<MethodDescriptionComposite> removeOverriddenMethods(
+             ArrayList<MethodDescriptionComposite>
+                     methodList, DescriptionBuilderComposite dbc) {
+-        HashMap<String, Integer> hierarchyMap = getClassHierarchy(dbc);
++        Map<String, Integer> hierarchyMap = dbc.isInterface() ? getInterfaceHierarchy(dbc)
: getClassHierarchy(dbc);
+         ArrayList<MethodDescriptionComposite> returnMethods =
+                 new ArrayList<MethodDescriptionComposite>();
+         for (int i = 0; i < methodList.size(); i++) {
+@@ -779,8 +830,7 @@
+     private static MethodDescriptionComposite getBaseMethod(MethodDescriptionComposite mdc,
+                                                             int index,
+                                                             ArrayList<MethodDescriptionComposite>
methodList,
+-                                                            HashMap<String, Integer>
+-                                                                    hierarchyMap) {
++                                                            Map<String, Integer> hierarchyMap)
{
+         int baseLevel = hierarchyMap.get(mdc.getDeclaringClass());
+         if (log.isDebugEnabled()) {
+             log.debug("Base method: " + mdc.getMethodName() + " initial level: " + baseLevel);
+Index: modules/metadata/pom.xml
+===================================================================
+--- modules/metadata/pom.xml	(revision 751793)
++++ modules/metadata/pom.xml	(working copy)
+@@ -85,7 +85,7 @@
+ 			<resource>
+ 				<directory>src</directory>
+ 				<excludes>
+-					<exclude>*.java</exclude>
++					<exclude>**/*.java</exclude>
+ 				</excludes>
+ 			</resource>
+ 		</resources>



Mime
View raw message