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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jul 18 07:50:44 2013
New Revision: 4595

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4595&view=rev
Log:
IDP209  Parse scripted matcher.  Includes a minor change to loggingprovoked by the tests

Added:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedMatcherParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scriptedNotThere.xml   (with props)
Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/ScriptedPolicyRule.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/ScriptedPolicyRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/ScriptedPolicyRule.java?rev=4595&r1=4594&r2=4595&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/ScriptedPolicyRule.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/ScriptedPolicyRule.java Thu Jul 18 07:50:44 2013
@@ -46,7 +46,7 @@
 @ThreadSafe
 public class ScriptedPolicyRule extends AbstractDestructableIdentifiableInitializableComponent implements
         PolicyRequirementRule, UnmodifiableComponent {
-    
+
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(ScriptedPolicyRule.class);
 
@@ -126,7 +126,8 @@
                 }
                 return Tristate.FALSE;
             } else {
-                log.error("{} Matcher script did not return a Boolean", getLogPrefix());
+                log.error("{} Matcher script returned a {}, not a java.lang.Boolean", getLogPrefix(), result.getClass()
+                        .toString());
                 return Tristate.FAIL;
             }
         } catch (ScriptException e) {

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=4595&r1=4594&r2=4595&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 Thu Jul 18 07:50:44 2013
@@ -85,9 +85,6 @@
 
         registerBeanDefinitionParser(NumOfAttributeValuesRuleParser.SCHEMA_TYPE, new NumOfAttributeValuesRuleParser());
 
-        /**
-         * registerBeanDefinitionParser(ScriptMatchFunctorBeanDefinitionParser.SCHEMA_TYPE, new
-         * ScriptMatchFunctorBeanDefinitionParser());
-         **/
+        registerBeanDefinitionParser(ScriptedMatcherParser.SCHEMA_TYPE, new ScriptedMatcherParser());
     }
 }