[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jul  4 10:54:49 2014
New Revision: 6218

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6218&view=rev
Log:
Make RequestedAttributeInMetadata an alias for AttributeInMetadata

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java
    trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java?rev=6218&r1=6217&r2=6218&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeFilterSAMLNamespaceHandler.java Fri Jul  4 10:54:49 2014
@@ -54,7 +54,9 @@
 
         registerBeanDefinitionParser(AttributeInMetadataRuleParser.ATTRIBUTE_IN_METADATA,
                 new AttributeInMetadataRuleParser());
-        registerBeanDefinitionParser(AttributeInMetadataRuleParser.ENTITY_ATTRIBUTE_IN_METADATA,
+        registerBeanDefinitionParser(AttributeInMetadataRuleParser.REQUESTED_ATTRIBUTE_IN_METADATA,
+                new AttributeInMetadataRuleParser());
+                registerBeanDefinitionParser(AttributeInMetadataRuleParser.ENTITY_ATTRIBUTE_IN_METADATA,
                 new AttributeInMetadataRuleParser());
 
         registerBeanDefinitionParser(RegistrationAuthorityRuleParser.SCHEMA_TYPE,

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java?rev=6218&r1=6217&r2=6218&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java Fri Jul  4 10:54:49 2014
@@ -26,10 +26,13 @@
 import net.shibboleth.idp.saml.profile.config.navigate.AttributeConsumerServiceLookupFunction;
 import net.shibboleth.idp.saml.profile.config.navigate.EntityDescriptorLookupFunction;
 import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
+import net.shibboleth.utilities.java.support.xml.QNameSupport;
 
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.saml.common.messaging.context.AttributeConsumingServiceContext;
 import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
@@ -41,6 +44,7 @@
  */
 public class AttributeInMetadataRuleParser extends BaseAttributeValueMatcherParser {
 
+    
     /** Schema type. */
     public static final QName ATTRIBUTE_IN_METADATA = new QName(AttributeFilterSAMLNamespaceHandler.NAMESPACE,
             "AttributeInMetadata");
@@ -48,6 +52,13 @@
     /** Schema type. */
     public static final QName ENTITY_ATTRIBUTE_IN_METADATA = new QName(AttributeFilterSAMLNamespaceHandler.NAMESPACE,
             "EntityAttributeInMetadata");
+
+    /** Schema type. */
+    public static final QName REQUESTED_ATTRIBUTE_IN_METADATA = new QName(AttributeFilterSAMLNamespaceHandler.NAMESPACE,
+            "RequestedAttributeInMetadata");
+
+    /** log. */
+    private final Logger log = LoggerFactory.getLogger(AttributeInMetadataRuleParser.class);
 
     /** {@inheritDoc} */
     @Override @Nonnull protected Class<AttributeInMetadataMatcher> getNativeBeanClass() {
@@ -58,6 +69,10 @@
     @Override protected void doNativeParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(config, builder);
+        
+        if (ATTRIBUTE_IN_METADATA.equals(QNameSupport.getNodeQName(config))) {
+            log.info("AttributeInMetadata is deprecated and superseded by RequestedAttributeInMetadata");
+        }
 
         if (config.hasAttributeNS(null, "onlyIfRequired")) {

[... 191 lines stripped ...]