cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1466340 - in /cxf/branches/2.6.x-fixes: ./ tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/A.java tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/C.java
Date Wed, 10 Apr 2013 06:12:57 GMT
Author: ffang
Date: Wed Apr 10 06:12:56 2013
New Revision: 1466340

URL: http://svn.apache.org/r1466340
Log:
Merged revisions 1466315 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1466315 | ffang | 2013-04-10 09:55:39 +0800 (三, 10  4 2013) | 13 lines
  
  Merged revisions 1465874,1465923 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1465874 | ffang | 2013-04-09 12:08:46 +0800 (二, 09  4 2013) | 1 line
    
    [CXF-4850]commit to expose the problem with CXF-4850
  ........
    r1465923 | ffang | 2013-04-09 16:14:44 +0800 (二, 09  4 2013) | 1 line
    
    [CXF-4850]add WebMethod(operationName=) to the inherit wethod to avoid name conflict in
wsdl
  ........
................

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/A.java
    cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/C.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1466315
  Merged /cxf/trunk:r1465874-1465923

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

Modified: cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/A.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/A.java?rev=1466340&r1=1466339&r2=1466340&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/A.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/A.java
Wed Apr 10 06:12:56 2013
@@ -46,4 +46,10 @@ public class A implements B {
     public String bye(String bye) {
         return bye;
     }
+
+    @Override
+    public String hello() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
\ No newline at end of file

Modified: cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/C.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/C.java?rev=1466340&r1=1466339&r2=1466340&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/C.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/inherit/C.java
Wed Apr 10 06:12:56 2013
@@ -18,7 +18,11 @@
  */
 package org.apache.cxf.tools.fortest.inherit;
 
+import javax.jws.WebMethod;
+
 public interface C {
     String hello(String hello);
     String bye(String bye);
+    @WebMethod(operationName = "anotherHello")
+    String hello();
 }
\ No newline at end of file



Mime
View raw message