[java-identity-provider COMMIT] in /trunk: idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/AnonymousP...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Mar 14 07:44:57 2014
New Revision: 5573

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5573&view=rev
Log:
IDP-277 Wire in the activation conditions in for AnonymousRelyingParty and DefaultRelyingParty.  Create stub implementations of the AnonymousProfilePredicate and EntitiesDescriptorPredicate

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/AnonymousProfilePredicate.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml
      - copied unchanged from r5570, trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party.xml   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/logic/EntitiesDescriptorPredicate.java   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AnonymousRelyingPartyParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java?rev=5573&r1=5572&r2=5573&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java Fri Mar 14 07:44:57 2014
@@ -73,5 +73,7 @@
                 SpringSupport.parseCustomElements(ElementSupport.getChildElements(element, PROFILE_CONFIGURATION),
                         parserContext);
         builder.addPropertyValue("profileConfigurations", profileConfigurations);
+        
+        builder.setInitMethodName("initialize");
     }
 }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AnonymousRelyingPartyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AnonymousRelyingPartyParser.java?rev=5573&r1=5572&r2=5573&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AnonymousRelyingPartyParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AnonymousRelyingPartyParser.java Fri Mar 14 07:44:57 2014
@@ -19,6 +19,8 @@
 
 import javax.xml.namespace.QName;
 
+import net.shibboleth.idp.profile.logic.AnonymousProfilePredicate;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
@@ -37,8 +39,7 @@
     @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
 
-        // TODO - plug in the predicate
-        // builder.addPropertyValue("activationCondition", <Something>)
+        builder.addPropertyValue("activationCondition", new AnonymousProfilePredicate());
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java?rev=5573&r1=5572&r2=5573&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java Fri Mar 14 07:44:57 2014
@@ -19,11 +19,15 @@
 
 import javax.xml.namespace.QName;
 
+import net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate;
+import net.shibboleth.idp.saml.impl.profile.logic.EntitiesDescriptorPredicate;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;

[... 67 lines stripped ...]