[java-identity-provider] branch master updated: Move the important beans a bit higher in the file.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=86574b54754b03431202904f3634e442123c8bbf

The following commit(s) were added to refs/heads/master by this push:
       new  86574b5   Move the important beans a bit higher in the file.
86574b5 is described below

commit 86574b54754b03431202904f3634e442123c8bbf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Feb 14 15:07:51 2020 -0500

    Move the important beans a bit higher in the file.
---
 .../resources/conf/authn/password-authn-config.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/authn/password-authn-config.xml b/idp-conf/src/main/resources/conf/authn/password-authn-config.xml
index 502e73e..73ac7f8 100644
--- a/idp-conf/src/main/resources/conf/authn/password-authn-config.xml
+++ b/idp-conf/src/main/resources/conf/authn/password-authn-config.xml
@@ -12,11 +12,23 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
     
-    <!-- You can optionally comment out anything you don't need. -->
+    <!--
+    You can optionally comment out anything you don't need, but make sure not to
+    reference the corresponding validator in the list below if you do remove any.
+    -->
     <import resource="jaas-authn-config.xml" />
     <import resource="krb5-authn-config.xml" />
     <import resource="ldap-authn-config.xml" />
     
+    <!-- Ordered list of CredentialValidators to apply to a request. -->
+    <util:list id="shibboleth.authn.Password.Validators">
+        <ref bean="shibboleth.LDAPValidator" />
+    </util:list>
+    
+    <!-- Controls whether all validators in the above bean have to succeed, or just one. -->
+    <util:constant id="shibboleth.authn.Password.RequireAll" static-field="java.lang.Boolean.FALSE"/>
+    
+    
     <!-- Names of form fields to pull username and password from. -->
     <bean id="shibboleth.authn.Password.UsernameFieldName" class="java.lang.String" c:_0="j_username" />
     <bean id="shibboleth.authn.Password.PasswordFieldName" class="java.lang.String" c:_0="j_password" />
@@ -36,14 +48,6 @@
         <bean parent="shibboleth.Pair" p:first="^(.+)@example\.org$" p:second="$1" />
         -->
     </util:list>
-        
-    <!-- Ordered list of CredentialValidators to apply to a request. -->
-    <util:list id="shibboleth.authn.Password.Validators">
-        <ref bean="shibboleth.LDAPValidator" />
-    </util:list>
-    
-    <!-- Controls whether all validators in the above bean have to succeed, or just one. -->
-    <util:constant id="shibboleth.authn.Password.RequireAll" static-field="java.lang.Boolean.FALSE"/>
     
     <!-- Uncomment to configure account lockout backed by in-memory storage. -->
     <!--

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.