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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Nov 18 03:08:24 2014
New Revision: 6928

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6928&view=rev
Log:
Move throw on deprecations to parsers corresponding to where these attributes actually appear in the schema, rather than globally in AbstractMetadataProviderParser. Seems more correct in general.
In particular, the global prohibition on 'maxCacheDuration' is interfering with the like-named attribute on the new dynamic metadata provider parser.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FilesystemMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceBackedMetadataProviderParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java?rev=6928&r1=6927&r2=6928&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java Tue Nov 18 03:08:24 2014
@@ -32,9 +32,6 @@
 import org.opensaml.saml.metadata.resolver.filter.impl.MetadataFilterChain;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.beans.factory.parsing.Location;
-import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -169,27 +166,6 @@
             builder.addPropertyValue("requireValidMetadata", element.getAttributeNS(null, "requireValidMetadata"));
         }
 
-        if (element.hasAttributeNS(null, "maxCacheDuration")) {
-            log.error("{}: maxCacheDuration is not supported", parserContext.getReaderContext().getResource()
-                    .getDescription());
-            throw new BeanDefinitionParsingException(new Problem("maxCacheDuration is not supported", new Location(
-                    parserContext.getReaderContext().getResource())));
-        }
-
-        if (element.hasAttributeNS(null, "cacheDuration")) {
-            log.error("{}: cacheDuration is not supported", parserContext.getReaderContext().getResource()
-                    .getDescription());
-            throw new BeanDefinitionParsingException(new Problem("cacheDuration is not supported", new Location(
-                    parserContext.getReaderContext().getResource())));
-        }
-
-        if (element.hasAttributeNS(null, "maintainExpiredMetadata")) {
-            log.error("{}: maintainExpiredMetadata is not supported", parserContext.getReaderContext().getResource()
-                    .getDescription());
-            throw new BeanDefinitionParsingException(new Problem("maintainExpiredMetadata is not supported",
-                    new Location(parserContext.getReaderContext().getResource())));
-        }
-
         final List<Element> filters =
                 ElementSupport.getChildElements(element, MetadataNamespaceHandler.METADATA_FILTER_ELEMENT_NAME);
 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FilesystemMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FilesystemMetadataProviderParser.java?rev=6928&r1=6927&r2=6928&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FilesystemMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FilesystemMetadataProviderParser.java Tue Nov 18 03:08:24 2014
@@ -20,6 +20,11 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
+import org.springframework.beans.factory.parsing.Location;

[... 92 lines stripped ...]