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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug 22 11:19:30 2016
New Revision: 8338

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8338&view=rev
Log:
IDP-813 flatten ad: namespace into resolver: namespace

https://issues.shibboleth.net/jira/browse/IDP-813

Schema changes, parsers and tests for Mapped and Templated definitions

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mapped.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValue.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMap.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateAttributes.xml
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AttributeDefinitionNamespaceHandler.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AttributeDefinitionNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AttributeDefinitionNamespaceHandler.java?rev=8338&r1=8337&r2=8338&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AttributeDefinitionNamespaceHandler.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AttributeDefinitionNamespaceHandler.java	Mon Aug 22 11:19:30 2016
@@ -59,13 +59,14 @@
                 new ScriptedAttributeDefinitionParser());
         registerBeanDefinitionParser(SimpleAttributeDefinitionParser.TYPE_NAME_AD,
                 new SimpleAttributeDefinitionParser());
-        registerBeanDefinitionParser(TemplateAttributeDefinitionParser.TYPE_NAME,
+        registerBeanDefinitionParser(TemplateAttributeDefinitionParser.TYPE_NAME_AD,
                 new TemplateAttributeDefinitionParser());
         registerBeanDefinitionParser(TransientIdAttributeDefinitionParser.TYPE_NAME_AD,
                 new TransientIdAttributeDefinitionParser());
-        registerBeanDefinitionParser(SourceValueParser.TYPE_NAME, new SourceValueParser());
-        registerBeanDefinitionParser(ValueMapParser.TYPE_NAME, new ValueMapParser());
-        registerBeanDefinitionParser(MappedAttributeDefinitionParser.TYPE_NAME, new MappedAttributeDefinitionParser());
+        registerBeanDefinitionParser(SourceValueParser.TYPE_NAME_AD, new SourceValueParser());
+        registerBeanDefinitionParser(ValueMapParser.TYPE_NAME_AD, new ValueMapParser());
+        registerBeanDefinitionParser(MappedAttributeDefinitionParser.TYPE_NAME_AD,
+                new MappedAttributeDefinitionParser());
     }
 
 }

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java?rev=8338&r1=8337&r2=8338&view=diff
==============================================================================

[... 851 lines stripped ...]