cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r910808 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ systests/databinding/
Date Wed, 17 Feb 2010 03:07:17 GMT
Author: dkulp
Date: Wed Feb 17 03:07:17 2010
New Revision: 910808

URL: http://svn.apache.org/viewvc?rev=910808&view=rev
Log:
Merged revisions 910807 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r910807 | dkulp | 2010-02-16 22:03:12 -0500 (Tue, 16 Feb 2010) | 2 lines
  
  [CXF-2673] Fix problem of Aegis not using the interface method when
  looking for annotations.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
    cxf/branches/2.2.x-fixes/systests/databinding/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=910808&r1=910807&r2=910808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Wed Feb 17 03:07:17 2010
@@ -647,6 +647,10 @@
     }
 
     private Method getMethod(Service s, OperationInfo op) {
+        Method m = op.getProperty(Method.class.getName(), Method.class);
+        if (m != null) {
+            return m;
+        }
         MethodDispatcher md = (MethodDispatcher)s.get(MethodDispatcher.class.getName());
         // The ibm jdk requires the simple frontend dependency to be
         // present for the SimpleMethodDispatcher cast below even if

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java?rev=910808&r1=910807&r2=910808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
Wed Feb 17 03:07:17 2010
@@ -82,7 +82,7 @@
                                Document notify);
 
         @WebMethod(operationName = "query", action = "")
-        @WebResult(name = "queryResponse",
+        @WebResult(name = "queryResponseDocs",
                    targetNamespace = "http://www.sics.se/NotificationLog")
         List<Document> query(@WebParam(name = "xpath",
                                        targetNamespace = "http://www.sics.se/NotificationLog")

Modified: cxf/branches/2.2.x-fixes/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/pom.xml?rev=910808&r1=910807&r2=910808&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/databinding/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/databinding/pom.xml Wed Feb 17 03:07:17 2010
@@ -245,6 +245,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
+            <version>4.4</version>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>



Mime
View raw message