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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Oct  5 23:52:56 2014
New Revision: 6632

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6632&view=rev
Log:
Convert status view into JSP, better fit.

Added:
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
    trunk/idp-conf/src/main/resources/views/status.vm

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=6632&r1=6631&r2=6632&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/status-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/status-flow.xml Sun Oct  5 23:52:56 2014
@@ -16,13 +16,8 @@
         <on-entry>
             <evaluate expression="WriteAuditLog" />
             <evaluate expression="ServiceCollection" result="requestScope.services" />
-            <evaluate expression="T(java.lang.Runtime).getRuntime()" result="requestScope.runtime" />
-            <evaluate expression="T(java.lang.System)" result="requestScope.System" />
-            <evaluate expression="T(net.shibboleth.idp.Version)" result="requestScope.Version" />
-            <evaluate expression="T(org.joda.time.format.ISODateTimeFormat).dateTimeNoMillis()" result="requestScope.dateTimeFormatter" />
-            <evaluate expression="new org.joda.time.DateTime(flowExecutionContext.getActiveSession().getDefinition().getApplicationContext().getStartupDate())"
-                result="requestScope.startupTime" />
-            <evaluate expression="T(org.joda.time.DateTime).now()" result="requestScope.now" />
+            <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" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
         </on-entry>