[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows: authn/authn-beans.xml saml/saml1/...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 14 16:13:24 2014
New Revision: 6294

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6294&view=rev
Log:
Forgot that we can use true/false for predicates.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml?rev=6294&r1=6293&r2=6294&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml Mon Jul 14 16:13:24 2014
@@ -36,7 +36,7 @@
     <bean id="ResolveAttributes"
             class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
             c:resolverService-ref="shibboleth.AttributeResolverService"
-            p:activationCondition-ref="#{ %{idp.authn.resolveAttribute:null} != null ? 'shibboleth.Conditions.True' : 'shibboleth.Conditions.False' }"
+            p:activationCondition="#{ %{idp.authn.resolveAttribute:null} != null }"
             p:attributesToResolve="#{ { %{idp.authn.resolveAttribute:null} } }">
         <property name="principalNameLookupStrategy">
             <bean class="com.google.common.base.Functions" factory-method="compose"
@@ -72,7 +72,7 @@
     
     <bean id="UpdateSessionWithAuthenticationResult"
         class="net.shibboleth.idp.session.impl.UpdateSessionWithAuthenticationResult" scope="prototype"
-        p:activationCondition-ref="#{ %{idp.session.enabled:true} ? 'shibboleth.Conditions.True' : 'shibboleth.Conditions.False' }"
+        p:activationCondition="%{idp.session.enabled:true}"
         p:sessionManager-ref="shibboleth.SessionManager" />
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=6294&r1=6293&r2=6294&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Mon Jul 14 16:13:24 2014
@@ -47,7 +47,7 @@
 
     <bean id="UpdateSessionWithSPSession"
         class="net.shibboleth.idp.session.impl.UpdateSessionWithSPSession" scope="prototype"
-        p:activationCondition-ref="#{ %{idp.session.enabled:true} ? 'shibboleth.Conditions.True' : 'shibboleth.Conditions.False' }"
+        p:activationCondition="%{idp.session.enabled:true}"
         p:sessionManager-ref="shibboleth.SessionManager"
         p:sessionLifetime="%{idp.session.defaultSPlifetime:PT2H}" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=6294&r1=6293&r2=6294&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Mon Jul 14 16:13:24 2014
@@ -67,7 +67,7 @@
 
     <bean id="UpdateSessionWithSPSession"
             class="net.shibboleth.idp.session.impl.UpdateSessionWithSPSession" scope="prototype"
-            p:activationCondition-ref="#{ %{idp.session.enabled:true} ? 'shibboleth.Conditions.True' : 'shibboleth.Conditions.False' }"
+            p:activationCondition="%{idp.session.enabled:true}"
             p:sessionManager-ref="shibboleth.SessionManager">
         <property name="SPSessionCreationStrategy">
             <bean class="net.shibboleth.idp.saml.session.impl.SAML2SPSessionCreationStrategy"