[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/error-mappings.xml conf/idp.properties sy...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jun 20 16:56:14 2014
New Revision: 6131

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6131&view=rev
Log:
Make the default error view a property.

Modified:
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/error-mappings.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/error-mappings.xml?rev=6131&r1=6130&r2=6131&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/error-mappings.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/error-mappings.xml Fri Jun 20 16:56:14 2014
@@ -11,7 +11,7 @@
 
 	<context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
 
-    <bean id="shibboleth.DefaultErrorView" class="java.lang.String" c:_0="error" />
+    <bean id="shibboleth.DefaultErrorView" class="java.lang.String" c:_0="${idp.errors.defaultView:error}" />
 
     <!-- If desired, map events to alternate error view templates. -->
     <!--

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6131&r1=6130&r2=6131&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Fri Jun 20 16:56:14 2014
@@ -44,6 +44,9 @@
 
 # Set to false to skip signing of SAML response messages that signal errors
 #idp.errors.signed = true
+
+# Set if a different default view name for events and exceptions is needed
+#idp.errors.defaultView = error
 
 # Set to "shibboleth.StorageService" for server-side storage
 #idp.session.StorageService = shibboleth.ClientStorageService

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=6131&r1=6130&r2=6131&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 Fri Jun 20 16:56:14 2014
@@ -43,7 +43,7 @@
             </props>
         </property>
         -->
-        <property name="defaultErrorView" value="error"/>
+        <property name="defaultErrorView" value="${idp.errors.defaultView:error}"/>
     </bean>
     
     <!-- ViewResolvers -->