[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/pom.xml idp-attribute-resolver-api/src/main/jav...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 10 04:54:42 2013
New Revision: 5012

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5012&view=rev
Log:
IDP-330 The attribute resolver implementation becomes a ServiceableComponent and gains its own parser.    We now use the stand along ReloadableSpringServce bean to access the component and obery the pin/unpin semantic in the ResolverAttributes Stage

Modified:
    trunk/idp-attribute-resolver-api/pom.xml
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverNamespaceHandler.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml
    trunk/idp-profile-impl/pom.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java

Modified: trunk/idp-attribute-resolver-api/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/pom.xml?rev=5012&r1=5011&r2=5012&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/pom.xml (original)
+++ trunk/idp-attribute-resolver-api/pom.xml Tue Dec 10 04:54:42 2013
@@ -20,6 +20,12 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-attribute-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java?rev=5012&r1=5011&r2=5012&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolverImpl.java Tue Dec 10 04:54:42 2013
@@ -29,13 +29,13 @@
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.service.AbstractServicableComponent;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.collection.LazyList;
 import net.shibboleth.utilities.java.support.collection.LazySet;
-import net.shibboleth.utilities.java.support.component.AbstractDestructableIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.component.ComponentValidationException;
@@ -61,7 +61,7 @@
  * {@link net.shibboleth.utilities.java.support.resolver.Criterion}s.
  * */
 @ThreadSafe
-public class AttributeResolverImpl extends AbstractDestructableIdentifiableInitializableComponent implements
+public class AttributeResolverImpl extends AbstractServicableComponent<AttributeResolver> implements
         AttributeResolver {
 
     /** Class logger. */
@@ -551,4 +551,9 @@
             checkedPlugins.add(pluginId);
         }
     }
+
+    /** {@inheritDoc} */
+    @Nonnull public AttributeResolver getComponent() {
+        return this;
+    }
 }

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverNamespaceHandler.java

[... 631 lines stripped ...]