[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: system/flows/admin/admin-abstract-flow.xml sys...

[noreply at shibboleth.net]

Author: serac
Date: Thu Dec 18 09:48:27 2014
New Revision: 7159

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7159&view=rev
Log:
IDP-545 Expose Spring Environment in views.

Modified:
    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/login/login-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
    trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-conf/src/main/resources/views/expiring-password.vm
    trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm
    trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.vm
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-conf/src/main/resources/views/logout-response.vm
    trunk/idp-conf/src/main/resources/views/logout.vm
    trunk/idp-conf/src/main/resources/views/resolvertest.vm

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=7159&r1=7158&r2=7159&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 Thu Dec 18 09:48:27 2014
@@ -25,6 +25,7 @@
     <end-state id="AuditedErrorView" view="#{MapEventToView.apply(currentEvent)}">
         <on-entry>
             <evaluate expression="WriteAuditLog" />
+            <evaluate expression="environment" result="requestScope.environment" />
             <evaluate expression="opensamlProfileRequestContext" result="requestScope.profileRequestContext" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
@@ -34,6 +35,7 @@
 
     <end-state id="ErrorView" view="#{MapEventToView.apply(currentEvent)}">
         <on-entry>
+            <evaluate expression="environment" result="requestScope.environment" />
             <evaluate expression="opensamlProfileRequestContext" result="requestScope.profileRequestContext" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml?rev=7159&r1=7158&r2=7159&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml Thu Dec 18 09:48:27 2014
@@ -59,6 +59,7 @@
             <evaluate expression="PostAssertionPopulateAuditContext" />
             <evaluate expression="PostResponsePopulateAuditContext" />
             <evaluate expression="WriteAuditLog" />
+            <evaluate expression="environment" result="requestScope.environment" />
             <evaluate expression="opensamlProfileRequestContext" result="requestScope.profileRequestContext" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.RelyingPartyContext), true).getSubcontext(T(net.shibboleth.idp.attribute.context.AttributeContext))" result="requestScope.attributeContext" />
             <evaluate expression="T(org.opensaml.core.xml.util.XMLObjectSupport)" result="requestScope.XMLObjectSupport" />

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/status-flow.xml?rev=7159&r1=7158&r2=7159&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/status-flow.xml (original)

[... 266 lines stripped ...]