[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/global.xml flows/authn/conditions/expirin...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep  2 13:36:55 2015
New Revision: 7721

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7721&view=rev
Log:
IDP-774 - Support for arbitrary objects in SWF views

Modified:
    trunk/idp-conf/src/main/resources/conf/global.xml
    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/views/error.vm
    trunk/idp-conf/src/main/resources/views/expiring-password.vm
    trunk/idp-conf/src/main/resources/views/login.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/conf/global.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global.xml?rev=7721&r1=7720&r2=7721&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/global.xml	Wed Sep  2 13:36:55 2015
@@ -34,4 +34,19 @@
     </util:list>
     -->
 
+    <!--
+    If you need to define and inject custom Java object(s) into the various views used throughout the
+    system (errors, login, logout, etc.), you can uncomment and define the bean below to be of any
+    type required. It will appear in the view scope as a variable named "custom".
+    
+    The example below defines the bean as a map, which allows you to inject multiple objects under
+    named keys to expand the feature to support multiple injected objects.
+    -->
+    
+    <!--
+    <util:map id="shibboleth.CustomViewContext">
+        <entry key="foo" value="bar"/>
+    </util:map>
+    -->
+    
 </beans>

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=7721&r1=7720&r2=7721&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	Wed Sep  2 13:36:55 2015
@@ -22,6 +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" />
         </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=7721&r1=7720&r2=7721&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	Wed Sep  2 13:36:55 2015
@@ -37,6 +37,9 @@
             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=7721&r1=7720&r2=7721&view=diff

[... 227 lines stripped ...]