svn commit: r1132976 - in /webservices/wss4j/trunk/src/main/java/org/apache/ws/security: WSDocInfo.java message/WSSecSignatureBase.java

[coheigea]

Author: coheigea
Date: Tue Jun  7 12:38:03 2011
New Revision: 1132976

URL: http://svn.apache.org/viewvc?rev=1132976&view=rev
Log:
Removing some warnings from the code.

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSDocInfo.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSDocInfo.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSDocInfo.java?rev=1132976&r1=1132975&r2=1132976&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSDocInfo.java 
(original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSDocInfo.java 
Tue Jun  7 12:38:03 2011
@@ -77,7 +77,6 @@ public class WSDocInfo {
      * Store a token element for later retrieval. Before storing the token, we 
check for a 
      * previously processed token with the same (wsu/SAML) Id.
      * @param element is the token element to store
-     * @deprecated
      */
     public void addTokenElement(Element element) throws WSSecurityException {
         addTokenElement(element, true);

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java?rev=1132976&r1=1132975&r2=1132976&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java
 Tue Jun  7 12:38:03 2011
@@ -123,7 +123,7 @@ public class WSSecSignatureBase extends 
                                     callbackLookup = new 
DOMCallbackLookup(doc);
                                 }
                                 toSignById = 
callbackLookup.getElement(idToSign, null, false);
-                                wsDocInfo.addProtectionElement(toSignById);
+                                wsDocInfo.addTokenElement(toSignById, false);
                             }
                             List<String> prefixes = 
getInclusivePrefixes(toSignById);
                             transformSpec = new ExcC14NParameterSpec(prefixes);
@@ -135,7 +135,7 @@ public class WSSecSignatureBase extends 
                             );
                     }
                     if (element != null) {
-                        wsDocInfo.addProtectionElement(element);
+                        wsDocInfo.addTokenElement(element, false);
                     }
                     javax.xml.crypto.dsig.Reference reference = 
                         signatureFactory.newReference(
@@ -166,7 +166,7 @@ public class WSSecSignatureBase extends 
                         );
                     }
                     for (Element elementToSign : elementsToSign) {
-                        wsDocInfo.addProtectionElement(elementToSign);
+                        wsDocInfo.addTokenElement(elementToSign, false);
                         TransformParameterSpec transformSpec = null;
                         if (wssConfig.isWsiBSPCompliant()) {
                             List<String> prefixes = 
getInclusivePrefixes(elementToSign);