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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Mar 15 13:02:55 2012
New Revision: 4119

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4119&view=rev
Log:
Start to update to compile cleanly against java-support changes.  Tests ongoing

Modified:
    trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AndMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/NotMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/OrMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AbstractComposedMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AndMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/OrMatcherTest.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseDataConnector.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/StaticAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/StaticDataConnector.java

Modified: trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java?rev=4119&r1=4118&r2=4119&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java (original)
+++ trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java Thu Mar 15 13:02:55 2012
@@ -332,7 +332,7 @@
         Assert.assertFalse(attrib.getValues().contains(value2));
 
         // test replacing all entries
-        Collection<LocalizedStringAttributeValue> values = new ArrayList<LocalizedStringAttributeValue>();
+        Collection<AttributeValue> values = new ArrayList<AttributeValue>();
         values.add(value2);
         attrib.setValues(values);
         Assert.assertFalse(attrib.getValues().isEmpty());

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java?rev=4119&r1=4118&r2=4119&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java Thu Mar 15 13:02:55 2012
@@ -127,8 +127,8 @@
     public boolean isApplicable(@Nonnull final AttributeFilterContext filterContext) throws AttributeFilteringException {
         assert filterContext != null : "Attribute filter context can not be null";
 
-        ifNotInitializedThrowUninitializedComponentException(getId());
-        ifDestroyedThrowDestroyedComponentException(getId());
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
         log.debug("Checking if attribute filter policy '{}' is active", getId());
 
@@ -155,8 +155,8 @@
     public void apply(@Nonnull final AttributeFilterContext filterContext) throws AttributeFilteringException {
         assert filterContext != null : "Attribute filter context can not be null";
 
-        ifNotInitializedThrowUninitializedComponentException(getId());
-        ifDestroyedThrowDestroyedComponentException(getId());
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 

[... 680 lines stripped ...]