Author: dvaleri
Date: Thu Apr 1 16:55:05 2010
New Revision: 930040
URL: http://svn.apache.org/viewvc?rev=930040&view=rev
Log:
Merged revisions 930037 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r930037 | dvaleri | 2010-04-01 12:44:57 -0400 (Thu, 01 Apr 2010) | 1 line
[CXF-2639] Removed extraneous @Override annotation that triggers build
failure on Hudson.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 1 16:55:05 2010
@@ -1 +1 @@
-/cxf/trunk:929993
+/cxf/trunk:929993,930037
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java?rev=930040&r1=930039&r2=930040&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
Thu Apr 1 16:55:05 2010
@@ -112,7 +112,6 @@ public class CryptoCoverageChecker exten
* if there is an error evaluating an XPath or an element is
not
* covered by the required cryptographic operation
*/
- @Override
public void handleMessage(SoapMessage message) throws Fault {
final Collection<WSDataRef> signed = new HashSet<WSDataRef>();
final Collection<WSDataRef> encrypted = new HashSet<WSDataRef>();
