[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src: main/java/edu/ main/java/edu/internet2/ ma...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Mar 29 13:34:43 2013
New Revision: 4373

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4373&view=rev
Log:
IDP-206 First part of backwards compatibility for V2 scripts.  Includes tests for all four examples taken from the wiki unchanged (apart from indentation).  On bug fix needed: the scripts implicitly assume that getValues() returns a list.

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/edu/
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/package-info.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example1.attribute.xml   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example2.attribute.xml   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.2.xml   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.xml   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.2.xml   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.3.xml   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.xml   (with props)
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script
Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeTest.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java?rev=4373&r1=4372&r2=4373&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java Fri Mar 29 13:34:43 2013
@@ -17,15 +17,13 @@
 
 package net.shibboleth.idp.attribute.resolver.impl.ad;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import net.shibboleth.idp.attribute.Attribute;
 import net.shibboleth.idp.attribute.AttributeValue;
@@ -33,6 +31,9 @@
 import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An encapsulated Attribute suitable for handing to scripts. This handles some of the cumbersome issues associated with
@@ -85,9 +86,10 @@
 
         log.debug("Attribute resolution '{}': Attribute Values being prepared", getId());
 
-        Set<Object> newValues = new HashSet<Object>(encapsulatedAttribute.getValues().size());
+        // NOTE.  This has to be a List - the examples use get(0)
+        ArrayList<Object> newValues = new ArrayList<Object>(encapsulatedAttribute.getValues().size());
         for (AttributeValue value : encapsulatedAttribute.getValues()) {

[... 168 lines stripped ...]