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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun  9 21:51:59 2014
New Revision: 6066

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6066&view=rev
Log:
Streamline error handling using message resource, also adds i18n support.

Modified:
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml
    trunk/idp-conf/src/main/resources/conf/messages.properties
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml
    trunk/idp-conf/src/main/resources/views/access-error.vm
    trunk/idp-conf/src/main/resources/views/authn-error.vm
    trunk/idp-conf/src/main/resources/views/black-swan-error.vm
    trunk/idp-conf/src/main/resources/views/endpoint-error.vm
    trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-conf/src/main/resources/views/relying-party-error.vm
    trunk/idp-conf/src/main/resources/views/security-cfg-error.vm
    trunk/idp-conf/src/main/resources/views/stale-error.vm

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=6066&r1=6065&r2=6066&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/error-mappings.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/error-mappings.xml Mon Jun  9 21:51:59 2014
@@ -11,52 +11,24 @@
 
 	<context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
 
-    <!-- List of events to trap and handle with local views, without returning to SPs. -->
-
-    <util:list id="shibboleth.LocalEvents">
-        <!--
-        <value>NoPotentialFlow</value>
-        -->
-    </util:list>
-    
     <bean id="shibboleth.DefaultErrorView" class="java.lang.String" c:_0="error" />
 
+    <!-- If desired, map events to alternate error view templates. -->
+    <!--
     <util:map id="shibboleth.EventViewMap">
-        <entry key="InvalidProfileConfiguration" value="relying-party-error" />
-        
         <entry key="MessageReplay" value="stale-error" />
         <entry key="MessageExpired" value="stale-error" />
         <entry key="UnableToDecode" value="stale-error" />
-        
-        <entry key="AccessDenied" value="access-error" />
+    </util:map>
+    -->
 
-        <entry key="InvalidSecurityConfiguration" value="security-cfg-error" />
-        
-        <entry key="EndpointResolutionFailed" value="endpoint-error" />
-        
-        <entry key="AccountError" value="authn-error" />
-        <entry key="AuthenticationException" value="authn-error" />
-        <entry key="InvalidCredentials" value="authn-error" />
-        <entry key="NoCredentials" value="authn-error" />
-        <entry key="NoPotentialFlow" value="authn-error" />
-        <entry key="RequestUnsupported" value="authn-error" />
-        <entry key="SubjectCanonicalizationError" value="authn-error" />
-        
-        <entry key="InvalidAttributeContext" value="black-swan-error" />
-        <entry key="InvalidAuthenticationContext" value="black-swan-error" />
-        <entry key="InvalidSubjectContext" value="black-swan-error" />
-        <entry key="InvalidSubjectCanonicalizationContext" value="black-swan-error" />
-        <entry key="InvalidMessageContext" value="black-swan-error" />
-        <entry key="InvalidMessageVersion" value="black-swan-error" />
-        <entry key="InvalidProfileContext" value="black-swan-error" />
-        <entry key="InvalidRelyingPartyContext" value="black-swan-error" />
-        <entry key="InvalidRelyingPartyConfiguration" value="black-swan-error" />
-        <entry key="MessageProcessingError" value="black-swan-error" />
-        <entry key="UnableToEncode" value="black-swan-error" />
-        <entry key="UnableToSign" value="black-swan-error" />
-        <entry key="UnableToEncrypt" value="black-swan-error" />
-    </util:map>
-
+    <!-- List of events to trap and handle with local views, without returning to SPs. -->
+    <!--
+    <util:list id="shibboleth.LocalEvents">
+        <value>NoPotentialFlow</value>
+    </util:list>
+    -->
+    
     <!-- Mappings of error events during requests to SAML status codes and SOAP fault codes. -->
 
     <util:map id="shibboleth.SAML1StatusMappings">

Modified: trunk/idp-conf/src/main/resources/conf/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/messages.properties?rev=6066&r1=6065&r2=6066&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/messages.properties Mon Jun  9 21:51:59 2014
@@ -1,1 +1,69 @@
-NoPotentialFlow=Save my walrus!
+AccessDenied = access
+
+EndpointResolutionFailed = endpoint
+
+InvalidProfileConfiguration = relying-party
+
+InvalidSecurityConfiguration = security-cfg
+
+MessageReplay = stale
+MessageExpired = stale
+UnableToDecode = stale
+

[... 156 lines stripped ...]