[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: Wed Jul 10 07:36:29 2013
New Revision: 4550

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4550&view=rev
Log:
IDP-287Add parsing for the new implementation of 'or' and 'any'

This allows the current test suite to be restored.

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeRuleParser.java
    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/AnyMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/OrMatcherParser.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java?rev=4550&r1=4549&r2=4550&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java Wed Jul 10 07:36:29 2013
@@ -48,11 +48,11 @@
             "AttributeFilterPolicyType");
 
     /** The PolicyRequirementRule QName. */
-    private static final QName POLICY_REQUIREMENT_RULE = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+    public static final QName POLICY_REQUIREMENT_RULE = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
             "PolicyRequirementRule");
 
     /** The PolicyRequirementRuleReference QName. */
-    private static final QName POLICY_REQUIREMENT_RULE_REF = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+    public static final QName POLICY_REQUIREMENT_RULE_REF = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
             "PolicyRequirementRuleReference");
 
     /** The AttributeRule QName. */

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeRuleParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeRuleParser.java?rev=4550&r1=4549&r2=4550&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeRuleParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeRuleParser.java Wed Jul 10 07:36:29 2013
@@ -48,18 +48,18 @@
     public static final QName TYPE_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeRuleType");
 
     /** PermitValueRule. */
-    private static final QName PERMIT_VALUE_RULE = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+    public static final QName PERMIT_VALUE_RULE = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
             "PermitValueRule");
 
     /** PermitValueRuleReference. */
-    private static final QName PERMIT_VALUE_REF = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+    public static final QName PERMIT_VALUE_REF = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
             "PermitValueRuleReference");
 
     /** DenyValueRule. */
-    private static final QName DENY_VALUE_RULE = new QName(AttributeFilterNamespaceHandler.NAMESPACE, "DenyValueRule");
+    public static final QName DENY_VALUE_RULE = new QName(AttributeFilterNamespaceHandler.NAMESPACE, "DenyValueRule");
 
     /** DenyValueRuleReference. */
-    private static final QName DENY_VALUE_REF = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+    public static final QName DENY_VALUE_REF = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
             "DenyValueRuleReference");
 
     /** Class logger. */

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=4550&r1=4549&r2=4550&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java (original)

[... 111 lines stripped ...]