[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Jun 20 02:50:03 2013
New Revision: 3392

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3392&view=rev
Log:
Introduce XML security -Parameters classes, beans which carry effective params used in crypto operations.
Update signing support classes, SAML encoders and tests to use these rather than the -Configuration one.
Remove defunct classes.
Introduce ConfigurableContentReference sub-interface, which allows setting the signature digest method. Necessary to take advantage of the reference digest method on SignatureSigningParameters.
 

Added:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionParameters.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/EncryptionParameters.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SignatureSigningParameters.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SignatureValidationParameters.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/messaging/
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/messaging/SecurityParametersContext.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/ConfigurableContentReference.java   (with props)
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SamlMessageSecuritySupport.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SamlSigningContext.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPRedirectDeflateEncoder.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
    trunk/opensaml-xmlsec-api/pom.xml
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/MockSignatureSigningConfiguration.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java?rev=3392&r1=3391&r2=3392&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/SAMLObjectContentReference.java Thu Jun 20 02:50:03 2013
@@ -22,6 +22,8 @@
 
 import net.shibboleth.utilities.java.support.collection.LazyList;
 import net.shibboleth.utilities.java.support.collection.LazySet;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.xml.security.signature.XMLSignature;
 import org.apache.xml.security.signature.XMLSignatureException;
@@ -33,7 +35,7 @@
 import org.opensaml.core.xml.NamespaceManager;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xmlsec.SecurityConfiguration;
-import org.opensaml.xmlsec.signature.support.ContentReference;
+import org.opensaml.xmlsec.signature.support.ConfigurableContentReference;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +71,7 @@
  * </p>
  * 
  */
-public class SAMLObjectContentReference implements ContentReference {
+public class SAMLObjectContentReference implements ConfigurableContentReference {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(SAMLObjectContentReference.class);
@@ -114,22 +116,15 @@
         return transforms;
     }
 
-    /**
-     * Gets the algorithm used to digest the content.
-     * 
-     * @return the algorithm used to digest the content
-     */
+    /** {@inheritDoc}. */
     public String getDigestAlgorithm() {
         return digestAlgorithm;
     }
 
-    /**
-     * Sets the algorithm used to digest the content.
-     * 
-     * @param newAlgorithm the algorithm used to digest the content
-     */
+    /** {@inheritDoc}. */
     public void setDigestAlgorithm(String newAlgorithm) {
-        digestAlgorithm = newAlgorithm;

[... 720 lines stripped ...]