[java-identity-provider COMMIT] /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingpart...

[noreply at shibboleth.net]

Author: rdw
Date: Tue May  6 04:37:36 2014
New Revision: 5851

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5851&view=rev
Log:
Do not default includeAttributeStatement or assertionLifetime.  Let the real class do it.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java?rev=5851&r1=5850&r2=5851&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java Tue May  6 04:37:36 2014
@@ -50,9 +50,6 @@
  */
 public abstract class BaseSAMLProfileConfigurationParser extends AbstractSingleBeanDefinitionParser {
 
-    /** default value when assertionLifetime isn't set. */
-    private static final long DEFAULT_ASSERTION_LIFETIME = 300000L;
-
     /** Class logger. */
     @Nonnull private Logger log = LoggerFactory.getLogger(BaseSAMLProfileConfigurationParser.class);
 
@@ -259,17 +256,11 @@
         if (element.hasAttributeNS(null, "assertionLifetime")) {
             // Set as a string and let the converter to the work
             builder.addPropertyValue("assertionLifetime", element.getAttributeNS(null, "assertionLifetime"));
-        } else {
-            log.debug("assertionLifetime not specified, defaulting to {}", DEFAULT_ASSERTION_LIFETIME);
-            builder.addPropertyValue("assertionLifetime", DEFAULT_ASSERTION_LIFETIME);
         }
 
         if (element.hasAttributeNS(null, "includeConditionsNotBefore")) {
             builder.addPropertyValue("includeConditionsNotBefore",
                     element.getAttributeNS(null, "includeConditionsNotBefore"));
-        } else {
-            log.debug("includeConditionsNotBefore not specified, defaulting to 'true'");
-            builder.addPropertyValue("includeConditionsNotBefore", true);
         }
 
         if (artifactAware) {