cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r910807 - in /cxf/trunk: 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/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
Date Wed, 17 Feb 2010 03:03:13 GMT
Author: dkulp
Date: Wed Feb 17 03:03:12 2010
New Revision: 910807

URL: http://svn.apache.org/viewvc?rev=910807&view=rev
Log:
[CXF-2673] Fix problem of Aegis not using the interface method when
looking for annotations.

Modified:
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
    cxf/trunk/systests/databinding/pom.xml
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=910807&r1=910806&r2=910807&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Wed Feb 17 03:03:12 2010
@@ -630,6 +630,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/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java?rev=910807&r1=910806&r2=910807&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
Wed Feb 17 03:03:12 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/trunk/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/pom.xml?rev=910807&r1=910806&r2=910807&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/pom.xml (original)
+++ cxf/trunk/systests/databinding/pom.xml Wed Feb 17 03:03:12 2010
@@ -245,6 +245,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
+            <version>4.4</version>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java?rev=910807&r1=910806&r2=910807&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
(original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
Wed Feb 17 03:03:12 2010
@@ -82,7 +82,7 @@
     @Test
     public void testFeed() throws Exception {
         String listing = WebClient.create("http://localhost:9080/services").get(String.class);
-        assertTrue(listing.contains("http://localhost:9080/atom/logs"));
+        assertTrue(listing, listing.contains("http://localhost:9080/atom/logs"));
         WebClient wc = WebClient.create("http://localhost:9080/resource/root");
         wc.path("/log").get();
         Thread.sleep(3000);



Mime
View raw message