cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1245614 - in /cxf/branches/2.3.x-fixes: ./ systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java
Date Fri, 17 Feb 2012 15:34:08 GMT
Author: dkulp
Date: Fri Feb 17 15:34:08 2012
New Revision: 1245614

URL: http://svn.apache.org/viewvc?rev=1245614&view=rev
Log:
Merged revisions 1241673 via  svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1241673 | dkulp | 2012-02-07 17:28:00 -0500 (Tue, 07 Feb 2012) | 16 lines
  
  Merged revisions 1241668 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1241668 | dkulp | 2012-02-07 17:24:53 -0500 (Tue, 07 Feb 2012) | 9 lines
    
    Merged revisions 1241666 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1241666 | dkulp | 2012-02-07 17:23:11 -0500 (Tue, 07 Feb 2012) | 1 line
      
      Remove override annotation
    ........
  ................
  
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java

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

Modified: cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java?rev=1245614&r1=1245613&r2=1245614&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java
(original)
+++ cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java
Fri Feb 17 15:34:08 2012
@@ -209,7 +209,6 @@ public class WSAFromJavaTest extends Abs
             super(Phase.READ);
             addAfter(ReadHeadersInterceptor.class.getName());
         }
-        @Override
         public void handleMessage(SoapMessage message) throws Fault {
             List<Header> headers = message.getHeaders();
             Header h2 = null;



Mime
View raw message