[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-impl/pom.xml idp-attribute-resolver-impl/pom.xml idp-...

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Feb  1 14:15:48 2012
New Revision: 4109

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4109&view=rev
Log:
add api module to test dependency
basic unit test for mapped attribute definition (seems to be working)
fix compile error in scripted attribute definition

Modified:
    trunk/idp-attribute-filter-impl/pom.xml
    trunk/idp-attribute-resolver-impl/pom.xml
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/MappedAttributeTester.java

Modified: trunk/idp-attribute-filter-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/pom.xml?rev=4109&r1=4108&r2=4109&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/pom.xml (original)
+++ trunk/idp-attribute-filter-impl/pom.xml Wed Feb  1 14:15:48 2012
@@ -22,19 +22,19 @@
             <artifactId>idp-attribute-filter-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-       <dependency>
-            <!-- TODO remove this -->
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-authn-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
 
         <!-- Test Dependencies -->
-        
+                <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-attribute-filter-api</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     
 </project>

Modified: trunk/idp-attribute-resolver-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/pom.xml?rev=4109&r1=4108&r2=4109&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Wed Feb  1 14:15:48 2012
@@ -38,6 +38,13 @@
         <!-- Runtime Dependencies -->
 
         <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-attribute-resolver-api</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         
     </dependencies>
     

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeDefinition.java?rev=4109&r1=4108&r2=4109&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ScriptedAttributeDefinition.java Wed Feb  1 14:15:48 2012
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.attribute.resolver.impl;
 
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import javax.script.ScriptContext;
@@ -25,9 +27,11 @@
 
 import net.jcip.annotations.ThreadSafe;
 import net.shibboleth.idp.attribute.Attribute;
+import net.shibboleth.idp.attribute.AttributeValue;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionException;
 import net.shibboleth.idp.attribute.resolver.BaseAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.PluginDependencySupport;
 import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
@@ -122,12 +126,13 @@
         scriptContext.setAttribute(getId(), null, ScriptContext.ENGINE_SCOPE);
         scriptContext.setAttribute("requestContext", resolutionContext, ScriptContext.ENGINE_SCOPE);
 
-        for (ResolverPluginDependency dep : getDependencies()) {
-            final Attribute dependentAttribute = dep.getDependentAttribute(resolutionContext);
-            if (null != dependentAttribute) {
-                scriptContext.setAttribute(dependentAttribute.getId(), dependentAttribute, ScriptContext.ENGINE_SCOPE);
-            }
+        Map<String, Set<AttributeValue>> dependencyAttributes =
+                PluginDependencySupport.getAllAttributeValues(resolutionContext, getDependencies());

[... 104 lines stripped ...]