[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/utilities.xml idp-profile-api/src/...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Sep 18 20:29:08 2015
New Revision: 7762

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7762&view=rev
Log:
Add a predicate around spring expressions, add some utility beans.

Added:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/SpringExpressionPredicate.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=7762&r1=7761&r2=7762&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml	Fri Sep 18 20:29:08 2015
@@ -24,11 +24,14 @@
     <bean id="shibboleth.Conditions.OR"
         class="com.google.common.base.Predicates" factory-method="or" abstract="true" />
     
+    <bean id="shibboleth.Conditions.BrowserProfile"
+        class="org.opensaml.profile.logic.BrowserProfilePredicate" />
     <bean id="shibboleth.Conditions.RelyingPartyId"
         class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate" abstract="true" />
-        
-    <bean id="shibboleth.Conditions.BrowserProfile"
-        class="org.opensaml.profile.logic.BrowserProfilePredicate" />
+    <bean id="shibboleth.Conditions.Scripted"
+        class="net.shibboleth.idp.profile.logic.ScriptedPredicate" abstract="true" />
+    <bean id="shibboleth.Conditions.Expression"
+        class="net.shibboleth.idp.profile.logic.SpringExpressionPredicate" abstract="true" />
 
     <bean id="shibboleth.MessageContextLookup.Inbound"
         class="org.opensaml.profile.context.navigate.InboundMessageContextLookup" />