[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: Mon Sep  5 11:13:38 2011
New Revision: 4054

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4054&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-43 PrincicpalNameRegexCriterion

Also clean up the names for PrincicpalNameStringCriterion

Added:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameRegexCriterion.java   (with props)
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameStringCriterion.java   (contents, props changed)
      - copied, changed from r4053, trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributePrincipalNameCriterion.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestPrincipalNameRegex.java   (with props)
Removed:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributePrincipalNameCriterion.java
Modified:
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestPrincipalNameString.java

Copied: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameStringCriterion.java (from r4053, trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributePrincipalNameCriterion.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameStringCriterion.java?p2=trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameStringCriterion.java&p1=trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributePrincipalNameCriterion.java&r1=4053&r2=4054&rev=4054&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributePrincipalNameCriterion.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/PrincipalNameStringCriterion.java Mon Sep  5 11:13:38 2011
@@ -28,11 +28,11 @@
 /**
  * Implement the AttributePrincipalNameStringPolicy activation criterion.
  * 
- * If the supplied attribute name has any value which matches the provided string (according to the provided case
- * sensitivity criterion) then we return true.
+ * If the (sole) Principal matches the provided string (according to the provided case sensitivity criterion) then we
+ * return true.
  */
 @ThreadSafe
-public class AttributePrincipalNameCriterion extends BaseStringCompare implements
+public class PrincipalNameStringCriterion extends BaseStringCompare implements
         EvaluableCriterion<AttributeFilterContext> {
 
     /**

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestPrincipalNameString.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestPrincipalNameString.java?rev=4054&r1=4053&r2=4054&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestPrincipalNameString.java (original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestPrincipalNameString.java Mon Sep  5 11:13:38 2011
@@ -24,11 +24,11 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/** tests for the {@link AttributeValueStringCriterion}. */
+/** tests for the {@link PrincipalNameStringCriterion}. */
 public class TestPrincipalNameString {
 
     /**
-     * Test principal name matching. Paramterization is tested in other tests.
+     * Test principal name matching. Parameterization is tested in other tests.
      * 
      * @throws EvaluationException to keep the compiler happy.
      * @throws ComponentInitializationException never
@@ -37,14 +37,14 @@
     public void principalNameCriterionTest() throws EvaluationException, ComponentInitializationException {
 
         AttributeFilterContext filterContext = new AttributeFilterContext(new TestContextContainer());
-        AttributePrincipalNameCriterion filter = new AttributePrincipalNameCriterion();
+        PrincipalNameStringCriterion filter = new PrincipalNameStringCriterion();
         filter.setMatchString("noMatch");
         filter.setCaseSensitive(false);
         filter.initialize();
         Assert.assertFalse(filter.evaluate(filterContext), "match against \"noMatch\"");
 
         filterContext = new AttributeFilterContext(new TestContextContainer());
-        filter = new AttributePrincipalNameCriterion();
+        filter = new PrincipalNameStringCriterion();

[... 22 lines stripped ...]