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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri May 24 15:56:14 2013
New Revision: 4493

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4493&view=rev
Log:
Test simple configurations of the attribute filter service. AttributeRule is now an IdentifiableComponent, and the PermitValueRule and DenyValueRule classes have been deleted as they were difficult to parse via Spring and replaced by MatchFunctors. Include an implementation of AnyMatcher. The attribute filter parsers are not complete, and there is some uncertainty regarding how to handle id attributes.

Added:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/logic/AnyMatcher.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/MatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/basic/OrMatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/matcher/
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/matcher/AbstractAttributeTargetedStringMatchFunctorParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/matcher/AbstractStringMatchFunctorParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/matcher/attributevalue/
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/attribute/filtering/spring/AttributeFilterServiceTest.java
      - copied, changed from r4486, trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/attribute/filtering/spring/TestAttributeFilterService.java
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy3.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/service.xml   (with props)
Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeRule.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/DenyValueRule.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/PermitValueRule.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicyTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngineTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicyTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/TargettedAttributeValueFilterTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/UntargettedAttributeValueFilterTest.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/AttributeFilterService.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/AttributeRuleParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/BaseFilterParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/basic/AnyMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/attribute/filtering/spring/basic/AttributeFilterBasicNamespaceHandler.java
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/test/
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeRule.java?rev=4493&r1=4492&r2=4493&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeRule.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeRule.java Fri May 24 15:56:14 2013
@@ -17,13 +17,16 @@
 
 package net.shibboleth.idp.attribute.filtering;
 
+import java.util.Set;
+
 import javax.annotation.Nonnull;

[... 925 lines stripped ...]