[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: rdw
Date: Fri May  9 08:45:10 2014
New Revision: 5897

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5897&view=rev
Log:
IDP-207 Wiring for basic Predicate Attribute Filter rule.
IDP-385 Fix schema to not take nion string basic types

Added:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/PredicateRuleParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicate1.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicate2.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateBeans.xml   (with props)
Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-basic.xsd
    trunk/idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java?rev=5897&r1=5896&r2=5897&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java Fri May  9 08:45:10 2014
@@ -28,6 +28,7 @@
 import net.shibboleth.idp.attribute.filter.spring.policyrule.AuthenticationMethodRegexRuleParser;
 import net.shibboleth.idp.attribute.filter.spring.policyrule.AuthenticationMethodRuleParser;
 import net.shibboleth.idp.attribute.filter.spring.policyrule.NumOfAttributeValuesRuleParser;
+import net.shibboleth.idp.attribute.filter.spring.policyrule.PredicateRuleParser;
 import net.shibboleth.idp.attribute.filter.spring.policyrule.PrincipalNameRegexRuleParser;
 import net.shibboleth.idp.attribute.filter.spring.policyrule.PrincipalNameRuleParser;
 import net.shibboleth.idp.spring.BaseSpringNamespaceHandler;
@@ -39,6 +40,7 @@
     public static final String NAMESPACE = "urn:mace:shibboleth:2.0:afp:mf:basic";
 
     /** {@inheritDoc} */
+    @Override
     public void init() {
 
         registerBeanDefinitionParser(AnyParser.SCHEMA_TYPE, new AnyParser());
@@ -85,5 +87,7 @@
         registerBeanDefinitionParser(NumOfAttributeValuesRuleParser.SCHEMA_TYPE, new NumOfAttributeValuesRuleParser());
 
         registerBeanDefinitionParser(ScriptedMatcherParser.SCHEMA_TYPE, new ScriptedMatcherParser());
+        
+        registerBeanDefinitionParser(PredicateRuleParser.SCHEMA_TYPE, new PredicateRuleParser());
     }
 }

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java?rev=5897&r1=5896&r2=5897&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java Fri May  9 08:45:10 2014
@@ -52,7 +52,7 @@
 
     private static final String MATCHER_PATH = "/net/shibboleth/idp/attribute/filter/matcher/";
 
-    private static final String POLICY_RULE_PATH = "/net/shibboleth/idp/attribute/filter/policyrule/";
+    protected static final String POLICY_RULE_PATH = "/net/shibboleth/idp/attribute/filter/policyrule/";
 
     /**
      * Helper function to return attributes pulled from a file (on the classpath). The file is expected to contain a
@@ -71,8 +71,8 @@
         SAMLAttributeDataConnector connector = new SAMLAttributeDataConnector();
         connector.setId(xmlFileName);
         connector.setAttributesStrategy(new Function<AttributeResolutionContext, List<Attribute>>() {
-            @Nullable public List<Attribute> apply(@Nullable AttributeResolutionContext input) {
-                return (List<Attribute>) obj.getAttributes();

[... 112 lines stripped ...]