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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr 15 18:40:22 2014
New Revision: 5731

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5731&view=rev
Log:
Cleanup, correct JSP path.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/error.vm

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=5731&r1=5730&r2=5731&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml Tue Apr 15 18:40:22 2014
@@ -33,15 +33,11 @@
     <bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
        <property name="exceptionMappings">
           <props>
-             <prop key="org.springframework.webflow.execution.repository.FlowExecutionRestorationFailureException">
-                FlowExecutionRestorationFailureException
-             </prop>
+             <prop key="FlowExecutionRestorationFailureException">backbutton</prop>
           </props>
        </property>
-       <!-- 
        <property name="defaultErrorView" value="error"/>
-        -->
-    </bean>    
+    </bean>
     
     <!-- ViewResolvers -->
     
@@ -67,7 +63,7 @@
 
     <bean id="shibboleth.InternalViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-        <property name="prefix" value="/WEB-INF/jsp/"/>
+        <property name="prefix" value="/WEB-INF/idp/jsp/"/>
         <property name="suffix" value=".jsp"/>
     </bean>
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=5731&r1=5730&r2=5731&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml Tue Apr 15 18:40:22 2014
@@ -137,14 +137,14 @@
 
     <action-state id="SavePreviousEventAsError">
         <evaluate expression="SavePreviousEventAsError" />
-        <transition on="proceed" to="HandleError" />
+        <transition on="proceed" to="error" />
     </action-state>
 
     <end-state id="error" view="error">
         <on-entry>
-            <evaluate expression="flowRequestContext.getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext')" result="flowScope.profileRequestContext" />
-            <evaluate expression="profileRequestContext.getSubcontext(T(org.opensaml.profile.context.ErrorEventContext))" result="flowScope.errorEventContext" />
-            <evaluate expression="T(org.owasp.esapi.ESAPI).encoder()" result="flowScope.esapiEncoder" />
+            <evaluate expression="flowRequestContext.getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext')" result="requestScope.profileRequestContext" />
+            <evaluate expression="profileRequestContext.getSubcontext(T(org.opensaml.profile.context.ErrorEventContext))" result="requestScope.errorEventContext" />
+            <evaluate expression="T(org.owasp.esapi.ESAPI).encoder()" result="requestScope.encoder" />
         </on-entry>
     </end-state>
 

Modified: trunk/idp-conf/src/main/resources/views/error.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/error.vm?rev=5731&r1=5730&r2=5731&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/error.vm (original)
+++ trunk/idp-conf/src/main/resources/views/error.vm Tue Apr 15 18:40:22 2014
@@ -10,8 +10,8 @@
     
     <h2>ERROR</h2>
 
-    #set ($encoder = $flowRequestContext.getFlowScope().get('esapiEncoder'))
-    #set ($errorEventContext = $flowRequestContext.getFlowScope().get('errorEventContext'))
+    #set ($encoder = $flowRequestContext.getRequestScope().get('encoder'))
+    #set ($errorEventContext = $flowRequestContext.getRequestScope().get('errorEventContext'))
 
     #if ( $errorEventContext && $errorEventContext.getEvent() )
             <p>ERROR: $encoder.encodeForHTML($errorEventContext.getEvent().toString())</p>