[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: Tue Jul 16 10:18:57 2013
New Revision: 4576

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4576&view=rev
Log:
IDP-207 Parsers and their tests for the regexp attribute value/scope parsers and the attribute scope parser

Added:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AbstractRegexMatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeMatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeRegexMatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueRegexMatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeRegexMatcherParserTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeScopeMatcherParserTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeScopeRegexMatcherParserTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/AttributeRegex.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/AttributeScope.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/AttributeScopeRegex.xml   (with props)
Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeValueMatcherParserTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/NotTest.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java?rev=4576&r1=4575&r2=4576&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java Tue Jul 16 10:18:57 2013
@@ -17,6 +17,9 @@
 
 package net.shibboleth.idp.attribute.filter.spring.basic;
 
+import net.shibboleth.idp.attribute.filter.spring.matcher.AttributeScopeMatcherParser;
+import net.shibboleth.idp.attribute.filter.spring.matcher.AttributeScopeRegexMatcherParser;
+import net.shibboleth.idp.attribute.filter.spring.matcher.AttributeValueRegexMatcherParser;
 import net.shibboleth.idp.attribute.filter.spring.matcher.AttributeValueStringMatcherParser;
 import net.shibboleth.idp.spring.BaseSpringNamespaceHandler;
 
@@ -45,6 +48,14 @@
         registerBeanDefinitionParser(AttributeValueStringMatcherParser.SCHEMA_TYPE,
                 new AttributeValueStringMatcherParser());
 
+        registerBeanDefinitionParser(AttributeScopeMatcherParser.SCHEMA_TYPE, new AttributeScopeMatcherParser());
+
+        registerBeanDefinitionParser(AttributeValueRegexMatcherParser.SCHEMA_TYPE,
+                new AttributeValueRegexMatcherParser());
+
+        registerBeanDefinitionParser(AttributeScopeRegexMatcherParser.SCHEMA_TYPE,
+                new AttributeScopeRegexMatcherParser());
+
         // Policy
 
         /**
@@ -62,15 +73,6 @@
          * 
          * registerBeanDefinitionParser(AttributeRequesterStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE, new
          * AttributeRequesterStringMatchFunctionBeanDefinitionParser());
-         * 
-         * registerBeanDefinitionParser(AttributeScopeRegexMatchFunctionBeanDefinitionParser.SCHEMA_TYPE, new
-         * AttributeScopeRegexMatchFunctionBeanDefinitionParser());
-         * 
-         * registerBeanDefinitionParser(AttributeScopeStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE, new
-         * AttributeScopeStringMatchFunctionBeanDefinitionParser());
-         * 
-         * registerBeanDefinitionParser(AttributeValueRegexMatchFunctionBeanDefinitionParser.SCHEMA_TYPE, new
-         * AttributeValueRegexMatchFunctionBeanDefinitionParser());
          * 
          * registerBeanDefinitionParser(AttributeValueStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE, new
          * AttributeValueStringMatchFunctionBeanDefinitionParser());


[... 56 lines stripped ...]