cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r954628 - in /cxf/branches/2.2.x-fixes: ./ systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java
Date Mon, 14 Jun 2010 20:20:08 GMT
Author: sergeyb
Date: Mon Jun 14 20:20:08 2010
New Revision: 954628

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

........
  r954619 | sergeyb | 2010-06-14 21:08:01 +0100 (Mon, 14 Jun 2010) | 1 line
  
  Fixing build failure with Java 5.0
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 14 20:20:08 2010
@@ -1 +1 @@
-/cxf/trunk:954552-954559
+/cxf/trunk:954552-954559,954619

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

Modified: cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java?rev=954628&r1=954627&r2=954628&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSourcePayloadProvider.java
Mon Jun 14 20:20:08 2010
@@ -22,7 +22,6 @@ package org.apache.cxf.systest.provider;
 public class HWSourcePayloadProvider extends AbstractSourcePayloadProvider
     implements Comparable<HWSourcePayloadProvider> {
  
-    @Override
     public int compareTo(HWSourcePayloadProvider p) {
         return p == this ? 0 : -1;
     }



Mime
View raw message