[java-identity-provider COMMIT] in /trunk/idp-saml-api/src: main/java/net/shibboleth/idp/saml/profile/config/Abstract...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 17 14:52:28 2013
New Revision: 5047

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5047&view=rev
Log:
Add a field to SAML profile config, and implement SAMLArtifactConfig.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfiguration.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConfiguration.java   (with props)
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfigurationTest.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLProfileConfiguration.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfigurationTest.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java?rev=5047&r1=5046&r2=5047&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java Tue Dec 17 14:52:28 2013
@@ -23,6 +23,7 @@
 import java.util.Set;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
@@ -55,8 +56,14 @@
     /** Lifetime of an assertion in milliseconds. Default value: 5 minutes */
     @Positive @Duration private long assertionLifetime;
 
+    /** Whether to include a NotBefore attribute in the Conditions of generated assertions. */
+    private boolean includeConditionsNotBefore;
+    
     /** Additional audiences to which an assertion may be released. Default value: empty */
     @Nonnull @NonnullElements private Set<String> assertionAudiences;
+        
+    /** SAML artifact configuration. */
+    @Nullable private SAMLArtifactConfiguration artifactConfig;
 
     /**
      * Constructor.
@@ -79,9 +86,9 @@
     }
 
     /**
-     * Set the predicate used to determine if the generated assertion should be signed.
+     * Set the predicate used to determine if generated assertions should be signed.
      * 
-     * @param predicate predicate used to determine if the generated assertion should be signed
+     * @param predicate predicate used to determine if generated assertions should be signed
      */
     public void setSignAssertionsPredicate(@Nonnull final Predicate<ProfileRequestContext> predicate) {
         signAssertionsPredicate =
@@ -89,16 +96,16 @@
     }
 
     /** {@inheritDoc} */
-    @Nonnull public Predicate<ProfileRequestContext> getSignedRequestsPredicate() {
+    @Nonnull public Predicate<ProfileRequestContext> getSignRequestsPredicate() {
         return signedRequestsPredicate;
     }
 
     /**
-     * Set the predicate used to determine if the received request should be signed.
+     * Set the predicate used to determine if generated requests should be signed.
      * 
-     * @param predicate predicate used to determine if the received request should be signed
+     * @param predicate predicate used to determine if generated requests should be signed
      */
-    public void setSignedRequestsPredicate(@Nonnull final Predicate<ProfileRequestContext> predicate) {
+    public void setSignRequestsPredicate(@Nonnull final Predicate<ProfileRequestContext> predicate) {
         signedRequestsPredicate =
                 Constraint.isNotNull(predicate,
                         "Predicate to determine if received requests should be signed cannot be null");
@@ -110,9 +117,9 @@
     }
 
     /**
-     * Set the predicate used to determine if the generated response should be signed.
+     * Set the predicate used to determine if generated responses should be signed.
      * 
-     * @param predicate predicate used to determine if the generated response should be signed
+     * @param predicate predicate used to determine if generated responses should be signed
      */
     public void setSignResponsesPredicate(@Nonnull final Predicate<ProfileRequestContext> predicate) {
         signResponsesPredicate =
@@ -131,6 +138,20 @@
      */
     public void setAssertionLifetime(@Positive @Duration final long lifetime) {
         assertionLifetime = Constraint.isGreaterThan(0, lifetime, "Assertion lifetime must be greater than 0");
+    }
+    
+    /** {@inheritDoc} */
+    public boolean isIncludeConditionsNotBefore() {
+        return includeConditionsNotBefore;
+    }
+    
+    /**
+     * Set whether to include a NotBefore attribute in the Conditions of generated assertions.
+     * 

[... 146 lines stripped ...]