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

[noreply at shibboleth.net]

Author: rdw
Date: Sun Mar 30 05:05:40 2014
New Revision: 5661

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5661&view=rev
Log:
Leave deprecated attributes *in* the schema and fail in the parser instead

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

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=5661&r1=5660&r2=5661&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 Sun Mar 30 05:05:40 2014
@@ -27,6 +27,9 @@
 
 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;
@@ -83,9 +86,22 @@
         }
 
         if (isPresentNotChaining(element, "requireValidMetadata")) {
-            
             builder.addPropertyValue("requireValidMetadata", element.getAttributeNS(null, "requireValidMetadata"));
+        }
 
+        if (element.hasAttributeNS(null, "maxCacheDuration")) {
+            throw new BeanDefinitionParsingException(new Problem("maxCacheDuration is not supported", new Location(
+                    parserContext.getReaderContext().getResource())));
+        }
+
+        if (element.hasAttributeNS(null, "cacheDuration")) {
+            throw new BeanDefinitionParsingException(new Problem("cacheDuration is not supported", new Location(
+                    parserContext.getReaderContext().getResource())));
+        }
+
+        if (element.hasAttributeNS(null, "maintainExpiredMetadata")) {
+            throw new BeanDefinitionParsingException(new Problem("maintainExpiredMetadata is not supported",
+                    new Location(parserContext.getReaderContext().getResource())));
         }
 
         final List<Element> filters =

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd?rev=5661&r1=5660&r2=5661&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd Sun Mar 30 05:05:40 2014
@@ -55,6 +55,11 @@
                         </annotation>
                     </element>
                 </sequence>
+                <attribute name="maxCacheDuration" type="string">
+                    <annotation>
+                        <documentation>This property is deprecated, use maxRefreshDelay instead.</documentation>
+                    </annotation>
+                </attribute>
             </extension>
         </complexContent>
     </complexType>
@@ -121,6 +126,16 @@
                         </documentation>
                     </annotation>
                 </attribute>
+                <attribute name="maintainExpiredMetadata" type="boolean">
+                    <annotation>
+                        <documentation>This is deprecated, use requireValidMetadata instead.</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>
@@ -183,6 +198,11 @@
                 <attribute name="metadataFile" type="string" use="required">
                     <annotation>
                         <documentation>The path to the metadata file.</documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="maintainExpiredMetadata" type="boolean">
+                    <annotation>
+                        <documentation>This is deprecated, use requireValidMetadata instead.</documentation>

[... 4 lines stripped ...]