[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn-flow-descriptors.xml conf/jaas-auth...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Dec 15 16:43:11 2013
New Revision: 5030

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5030&view=rev
Log:
Sync to testbed

Modified:
    trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
    trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml?rev=5030&r1=5029&r2=5030&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml Sun Dec 15 16:43:11 2013
@@ -81,35 +81,6 @@
     </util:list>
 
     <!--
-    Define entries here to map error messages thrown by authentication plugins like JAAS modules
-    and classify them as particular kinds of errors for use in your templates and as events in flows.
-    -->
-    <util:map id="shibboleth.ClassifiedMessageMap">
-        <entry key="UnknownUsername">
-            <list>
-                <value>CLIENT_NOT_FOUND</value>
-                <value>DN_RESOLUTION_FAILURE</value>
-            </list>
-        </entry>
-        <entry key="InvalidPassword">
-            <list>
-                <value>PREAUTH_FAILED</value>
-                <value>INVALID_CREDENTIALS</value>
-            </list>
-        </entry>
-        <entry key="ExpiredPassword">
-            <list>
-                <value>PASSWORD_EXPIRED</value>
-            </list>
-        </entry>
-        <entry key="ExpiringPassword">
-            <list>
-                <value>ACCOUNT_WARNING</value>
-            </list>
-        </entry>
-    </util:map>
-
-    <!--
     Defining this allows us to specify symbolic text replacements that shrink the size of results
     saved to client-side storage such as cookies.
     -->

Modified: trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml?rev=5030&r1=5029&r2=5030&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml Sun Dec 15 16:43:11 2013
@@ -47,4 +47,33 @@
         -->
     </util:list>
 
+    <!--
+    Define entries here to map error messages thrown by JAAS modules and classify them as particular
+    kinds of errors for use in your templates and as events in flows.
+    -->
+    <util:map id="shibboleth.authn.JAAS.ClassifiedMessageMap">
+        <entry key="UnknownUsername">
+            <list>
+                <value>CLIENT_NOT_FOUND</value>
+                <value>DN_RESOLUTION_FAILURE</value>
+            </list>
+        </entry>
+        <entry key="InvalidPassword">
+            <list>
+                <value>PREAUTH_FAILED</value>
+                <value>INVALID_CREDENTIALS</value>
+            </list>
+        </entry>
+        <entry key="ExpiredPassword">
+            <list>
+                <value>PASSWORD_EXPIRED</value>
+            </list>
+        </entry>
+        <entry key="ExpiringPassword">
+            <list>
+                <value>ACCOUNT_WARNING</value>
+            </list>
+        </entry>
+    </util:map>
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml?rev=5030&r1=5029&r2=5030&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml Sun Dec 15 16:43:11 2013
@@ -52,5 +52,32 @@
         <value>businessCategory</value>
         <value>mail</value>
     </util:list>
+
+    <!--
+    Define entries here to map error messages thrown by LDAP module and classify them as particular
+    kinds of errors for use in your templates and as events in flows.
+    -->
+    <util:map id="shibboleth.authn.LDAP.ClassifiedMessageMap">
+        <entry key="UnknownUsername">
+            <list>
+                <value>DN_RESOLUTION_FAILURE</value>
+            </list>
+        </entry>
+        <entry key="InvalidPassword">
+            <list>
+                <value>INVALID_CREDENTIALS</value>
+            </list>
+        </entry>
+        <entry key="ExpiredPassword">
+            <list>
+                <value>PASSWORD_EXPIRED</value>
+            </list>
+        </entry>
+        <entry key="ExpiringPassword">
+            <list>
+                <value>ACCOUNT_WARNING</value>

[... 36 lines stripped ...]