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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jul 12 09:13:53 2013
New Revision: 4557

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4557&view=rev
Log:
IDP-287 Put in the basic skeleton for all the AttributeValueMatcher Parsers.

All Attribute Value Matchers extend either AbstractStringMatchParser or [to be written] AbstractRegexMatchParser.  Both of these extent BaseAttributeValueMatcherParser which does all the funky injection into bridging beans. 

Added:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyParser.java
      - copied, changed from r4550, trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueStringMatcherParser.java
      - copied, changed from r4544, trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/attributevalue/AttributeValueStringMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
      - copied, changed from r4544, trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/MatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/package-info.java   (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/MatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyMatcherParser.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
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AbstractAttributeTargetedStringMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/AbstractStringMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/attributevalue/

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=4557&r1=4556&r2=4557&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 Fri Jul 12 09:13:53 2013
@@ -168,6 +168,16 @@
             elem = ElementSupport.getElementAncestor(elem);
         } while (elem != null);
         log.warn("Element '{}' : could not find schema defined parent");
+        elem = element;
+        do {
+            if (ElementSupport.isElementNamed(element, AttributeFilterPolicyParser.POLICY_REQUIREMENT_RULE)) {
+                return true;
+            } else if (ElementSupport.isElementNamed(element, AttributeRuleParser.DENY_VALUE_RULE) ||
+                       ElementSupport.isElementNamed(element, AttributeRuleParser.PERMIT_VALUE_RULE)) {
+                return false;
+            }
+            elem = ElementSupport.getElementAncestor(elem);
+        } while (elem != null);
         return false;
     }
 }

Copied: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyParser.java (from r4550, trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyMatcherParser.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/AnyParser.java?p2=trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyParser.java&p1=trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyMatcherParser.java&r1=4550&r2=4557&rev=4557&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyMatcherParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyParser.java Fri Jul 12 09:13:53 2013
@@ -28,7 +28,7 @@
 /**
  * Bean definition parser for {@link AnyMatchFunctor} objects.
  */

[... 296 lines stripped ...]