[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 09:10:19 2013
New Revision: 4573

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4573&view=rev
Log:
IDP-207 Complete implementation and tests of the Logical (And/Or/Not) Match Functors.  Plus related bugfixes

Added:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AndMatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/NotMatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/NotTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/OrTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/and.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/not.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/or.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/and.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/not.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/or.xml   (with props)
Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/OrMatcherParser.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java?rev=4573&r1=4572&r2=4573&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java Tue Jul 16 09:10:19 2013
@@ -150,10 +150,10 @@
 
         Element elem = element;
         do {
-            if (ElementSupport.isElementNamed(element, AttributeFilterPolicyParser.POLICY_REQUIREMENT_RULE)) {
+            if (ElementSupport.isElementNamed(elem, AttributeFilterPolicyParser.POLICY_REQUIREMENT_RULE)) {
                 return true;
-            } else if (ElementSupport.isElementNamed(element, AttributeRuleParser.DENY_VALUE_RULE) ||
-                       ElementSupport.isElementNamed(element, AttributeRuleParser.PERMIT_VALUE_RULE)) {
+            } else if (ElementSupport.isElementNamed(elem, AttributeRuleParser.DENY_VALUE_RULE) ||
+                       ElementSupport.isElementNamed(elem, AttributeRuleParser.PERMIT_VALUE_RULE)) {
                 return false;
             }
             elem = ElementSupport.getElementAncestor(elem);

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=4573&r1=4572&r2=4573&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 09:10:19 2013
@@ -32,15 +32,22 @@
 
         registerBeanDefinitionParser(AnyParser.SCHEMA_TYPE, new AnyParser());
 
+        // LOGIC
+
+        registerBeanDefinitionParser(AndMatcherParser.SCHEMA_TYPE, new AndMatcherParser());
+
         registerBeanDefinitionParser(OrMatcherParser.SCHEMA_TYPE, new OrMatcherParser());
-        
+
+        registerBeanDefinitionParser(NotMatcherParser.SCHEMA_TYPE, new NotMatcherParser());
+
+        // Attribute
+
         registerBeanDefinitionParser(AttributeValueStringMatcherParser.SCHEMA_TYPE,
                 new AttributeValueStringMatcherParser());
 
+        // Policy
+
         /**
-         * registerBeanDefinitionParser(AndMatchFunctorBeanDefinitionParser.SCHEMA_TYPE, new

[... 31 lines stripped ...]