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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 12 08:25:46 2013
New Revision: 4326

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4326&view=rev
Log:
IDP-208 More of the easier predicates for attribute filtering.  That is to say the ones that match attribute values and are targeted at AttributeValuePredicateMatcher

Added:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeScopeRegexpPredicate.java   (with props)
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeScopeStringPredicate.java   (with props)
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeValueRegexpPredicate.java   (with props)
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeValueStringPredicate.java   (with props)
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseRegexpPredicate.java   (with props)
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseStringPredicate.java
      - copied, changed from r4320, trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeStringPredicate.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/package-info.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeScopeRegexpPredicateTest.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeScopeStringPredicateTest.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeValueRegexpPredicateTest.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeValueStringPredicateTest.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseRegexpPredicateTest.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseStringPredicateTest.java
      - copied, changed from r4320, trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeStringPredicateTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/DataSources.java   (with props)
Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeStringPredicate.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeStringPredicateTest.java

Copied: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseStringPredicate.java (from r4320, trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeStringPredicate.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseStringPredicate.java?p2=trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseStringPredicate.java&p1=trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeStringPredicate.java&r1=4320&r2=4326&rev=4326&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeStringPredicate.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseStringPredicate.java Tue Mar 12 08:25:46 2013
@@ -27,10 +27,10 @@
 /**
  * General matching predicate for Equals comparison if strings in Attribute Filters.   
  */
-public class AttributeStringPredicate implements Predicate {
+public abstract class BaseStringPredicate implements Predicate {
 
     /** Logger. */
-    private Logger log = LoggerFactory.getLogger(AttributeStringPredicate.class);
+    private Logger log = LoggerFactory.getLogger(BaseStringPredicate.class);
 
     /** String to match for a positive evaluation. */
     private String matchString;

Copied: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/BaseStringPredicateTest.java (from r4320, trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/AttributeStringPredicateTest.java)

[... 56 lines stripped ...]