You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/11/16 03:34:07 UTC
svn commit: r1410170 - in /cxf/branches/2.5.x-fixes: ./
rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/
Author: ffang
Date: Fri Nov 16 02:34:06 2012
New Revision: 1410170
URL: http://svn.apache.org/viewvc?rev=1410170&view=rev
Log:
Merged revisions 1409912,1409930 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................
r1409912 | dkulp | 2012-11-16 02:35:27 +0800 (五, 16 11 2012) | 9 lines
Merged revisions 1409843 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1409843 | dkulp | 2012-11-15 10:47:04 -0500 (Thu, 15 Nov 2012) | 2 lines
Fix eclipse warning
........
................
r1409930 | dkulp | 2012-11-16 03:00:32 +0800 (五, 16 11 2012) | 1 line
FIx build failures
................
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java
cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.6.x-fixes:r1409912,1409930
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java?rev=1410170&r1=1410169&r2=1410170&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java Fri Nov 16 02:34:06 2012
@@ -22,6 +22,7 @@ import javax.xml.ws.WebFault;
@WebFault
public class AddNumbersException extends Exception {
+ private static final long serialVersionUID = 1L;
private String info;
public AddNumbersException() {
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java?rev=1410170&r1=1410169&r2=1410170&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello2.java Fri Nov 16 02:34:06 2012
@@ -51,7 +51,6 @@ public class Hello2 implements HelloInte
return null;
}
- @Override
@WebMethod
public String addNumbers(int arg0, int arg1) throws AddNumbersException {
// TODO Auto-generated method stub
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java?rev=1410170&r1=1410169&r2=1410170&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello3.java Fri Nov 16 02:34:06 2012
@@ -54,7 +54,6 @@ public class Hello3 implements HelloInte
return null;
}
- @Override
@WebMethod
public String addNumbers(int arg0, int arg1) throws AddNumbersException {
// TODO Auto-generated method stub