[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: flows/authn/conditions/expiring-password/expir...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct  9 10:51:30 2015
New Revision: 7799

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7799&view=rev
Log:
Conditional injection of custom view object so we don't need a dummy bean.

Modified:
    trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml?rev=7799&r1=7798&r2=7799&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml	Fri Oct  9 10:51:30 2015
@@ -22,7 +22,7 @@
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="viewScope.encoder" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="viewScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
-            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext')" result="viewScope.custom" />
+            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().containsBean('shibboleth.CustomViewContext') ? flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext') : null" result="viewScope.custom" />
         </on-render>
         <transition on="proceed" to="proceed" />
     </view-state>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=7799&r1=7798&r2=7799&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Fri Oct  9 10:51:30 2015
@@ -37,9 +37,6 @@
             p:cacheSeconds="%{idp.message.cacheSeconds:300}"
             p:basenames-ref="#{'%{idp.message.resources:shibboleth.MessageSourceResources}'.trim()}"
             p:defaultEncoding="UTF-8" />
-
-    <!-- Dummy bean to make injection of this bean ID into views work for default configs. -->
-    <util:constant id="shibboleth.CustomViewContext" static-field="java.lang.Boolean.FALSE" />
 
     <import resource="../../conf/global.xml" />
     <import resource="../../conf/errors.xml" />

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml?rev=7799&r1=7798&r2=7799&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml	Fri Oct  9 10:51:30 2015
@@ -33,7 +33,7 @@
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
-            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext')" result="requestScope.custom" />

[... 218 lines stripped ...]