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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 10 07:16:21 2013
New Revision: 5018

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5018&view=rev
Log:
IDP-330 The attribute filter implementation becomes a ServiceableComponent and gains its own first class parser.    We now use the stand alone ReloadableSpringServce bean to access the component and obey the pin/unpin semantic in the FilterAttributes Stage

Modified:
    trunk/idp-attribute-filter-api/pom.xml
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterNamespaceHandler.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyGroupParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterService.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceParser.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java

Modified: trunk/idp-attribute-filter-api/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/pom.xml?rev=5018&r1=5017&r2=5018&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/pom.xml (original)
+++ trunk/idp-attribute-filter-api/pom.xml Tue Dec 10 07:16:21 2013
@@ -24,6 +24,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>idp-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>idp-attribute-mapper-api</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterNamespaceHandler.java?rev=5018&r1=5017&r2=5018&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterNamespaceHandler.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterNamespaceHandler.java Tue Dec 10 07:16:21 2013
@@ -29,9 +29,6 @@
 
     /** {@inheritDoc} */
     public void init() {
-        registerBeanDefinitionParser(AttributeFilterServiceParser.SCHEMA_TYPE,
-                new AttributeFilterServiceParser());
-
         BeanDefinitionParser parser = new AttributeFilterPolicyGroupParser();
         registerBeanDefinitionParser(AttributeFilterPolicyGroupParser.ELEMENT_NAME, parser);
         registerBeanDefinitionParser(AttributeFilterPolicyGroupParser.TYPE_NAME, parser);

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyGroupParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyGroupParser.java?rev=5018&r1=5017&r2=5018&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyGroupParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyGroupParser.java Tue Dec 10 07:16:21 2013
@@ -20,18 +20,18 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.idp.attribute.filter.AttributeFilterImpl;
 import net.shibboleth.idp.spring.SpringSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
@@ -42,7 +42,7 @@
  * {@link net.shibboleth.idp.attribute.filter.AttributeFilterPolicy} beans are sucked out of spring by type and injected

[... 456 lines stripped ...]