[java-identity-provider] 03/06: IDP-1423 Remove deprecated attribute 'cacheDuration'

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=f9c090c460b5c40cbecdb17e59fb420ccd93e8f8

commit f9c090c460b5c40cbecdb17e59fb420ccd93e8f8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 1 16:40:57 2019 +0000

    IDP-1423 Remove deprecated attribute 'cacheDuration'
    
    https://issues.shibboleth.net/jira/browse/IDP-1423
---
 .../relyingparty/metadata/impl/HTTPMetadataProviderParser.java | 10 ----------
 idp-schema/src/main/resources/schema/shibboleth-metadata.xsd   |  5 -----
 2 files changed, 15 deletions(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
index b90b6d6..111feed 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
@@ -23,9 +23,6 @@ import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
-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.ParserContext;
 import org.w3c.dom.Element;
@@ -52,13 +49,6 @@ public abstract class HTTPMetadataProviderParser extends AbstractReloadingMetada
         
         super.doNativeParse(element, parserContext, builder);
 
-        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())));
-        }
-
         final String tlsTrustEngineRef = StringSupport.trimOrNull(element.getAttributeNS(null, "tlsTrustEngineRef"));
         final Element tlsTrustEngine = ElementSupport.getFirstChildElement(element,
                 HTTPMetadataProvidersParserSupport.TLS_TRUST_ENGINE_ELEMENT_NAME);
diff --git a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
index 62609c2..73a00fa 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -172,11 +172,6 @@
                         <documentation>Server certificate will be ignored when using an HTTPS source.</documentation>
                     </annotation>
                 </attribute>
-                <attribute name="cacheDuration" type="string">
-                    <annotation>
-                        <documentation> This is deprecated, use maxRefreshDelay instead.</documentation>
-                    </annotation>
-                </attribute>
                 <attribute name="requestTimeout" type="string">
                     <annotation>
                         <documentation>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.