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

[noreply at shibboleth.net]

Author: rdw
Date: Sat May 10 04:43:39 2014
New Revision: 5900

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5900&view=rev
Log:
IDP-406 The predicates which get attached to reolvers and encoders are refered to by the attibute "activationCriterionRef"

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringConditional.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java?rev=5900&r1=5899&r2=5900&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java Sat May 10 04:43:39 2014
@@ -63,13 +63,13 @@
         builder.setInitMethodName("initialize");
         builder.setDestroyMethodName("destroy");
 
-        if (config.hasAttributeNS(null, "activationPredicateRef")) {
-            builder.addPropertyReference("activationCriteria", config.getAttributeNS(null, "activationPredicateRef"));
+        if (config.hasAttributeNS(null, "activationCriterionRef")) {
+            builder.addPropertyReference("activationCriteria", config.getAttributeNS(null, "activationCriterionRef"));
         }
 
-        if (config.hasAttributeNS(null, "profileContextStrategy")) {
+        if (config.hasAttributeNS(null, "profileContextStrategyRef")) {
             builder.addPropertyReference("profileContextStrategy",
-                    config.getAttributeNS(null, "profileContextStrategy"));
+                    config.getAttributeNS(null, "profileContextStrategyRef"));
         }
 
         List<Element> dependencyElements =

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java?rev=5900&r1=5899&r2=5900&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java Sat May 10 04:43:39 2014
@@ -62,8 +62,8 @@
             throw new BeanCreationException("Attribute encoder must contain a name property");
         }
         
-        if (config.hasAttributeNS(null, "activationConditionRef")) {
-            builder.addPropertyReference("activationCondition", config.getAttributeNS(null, "activationConditionRef"));
+        if (config.hasAttributeNS(null, "activationCriterionRef")) {
+            builder.addPropertyReference("activationCondition", config.getAttributeNS(null, "activationCriterionRef"));
         }
         
         builder.setInitMethodName("initialize");

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml?rev=5900&r1=5899&r2=5900&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml Sat May 10 04:43:39 2014
@@ -22,15 +22,15 @@
 
 	<resolver:AttributeDefinition xsi:type="Simple"
 		xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="EPA1"
-		sourceAttributeID="staticEpA" activationPredicateRef="peter"
-		profileContextStrategy="findProfileCtx">

[... 81 lines stripped ...]