[java-identity-provider] branch main updated: Reorder for clarity.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
       new  3648b26a4 Reorder for clarity.
3648b26a4 is described below

commit 3648b26a4dbbefc06fd8776e1f2a29e436f13e32
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 7 20:13:37 2020 -0400

    Reorder for clarity.
---
 .../net/shibboleth/idp/conf/authn-system.xml       | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
index 042a20d07..63fa923f4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/authn-system.xml
@@ -15,11 +15,30 @@
 	<import resource="${idp.home}/conf/authn/authn-comparison.xml" />
 	<import resource="conditional:${idp.home}/conf/authn/general-authn.xml" />
 
-    <!-- Management bean to collect and expose AuthenticationFlowDescriptors. -->
-    
-    <bean id="shibboleth.AuthenticationFlowDescriptorManager"
-        class="net.shibboleth.idp.authn.impl.AuthenticationFlowDescriptorManager"
-        p:components="#{getObject('shibboleth.AvailableAuthenticationFlows')}" />
+    <!-- A parent bean to default some of the flow boilerplate. -->
+
+    <bean id="shibboleth.AuthenticationFlow" abstract="true"
+            class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
+            p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
+            p:nonBrowserSupported="true"
+            p:passiveAuthenticationSupported="false"
+            p:forcedAuthenticationSupported="false"
+            p:proxyRestrictionsEnforced="%{idp.authn.enforceProxyRestrictions:true}"
+            p:lifetime="%{idp.authn.defaultLifetime:PT60M}"
+            p:inactivityTimeout="%{idp.authn.defaultTimeout:PT30M}"
+            p:principalWeightMap="#{getObject('shibboleth.AuthenticationPrincipalWeightMap') ?: getObject('shibboleth.DefaultAuthenticationPrincipalWeightMap')}"
+            p:principalServiceManager-ref="shibboleth.PrincipalServiceManager">
+        <property name="supportedPrincipals">
+            <list>
+                <bean parent="shibboleth.SAML2AuthnContextClassRef"
+                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
+                <bean parent="shibboleth.SAML2AuthnContextClassRef"
+                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
+                <bean parent="shibboleth.SAML1AuthenticationMethod"
+                    c:method="urn:oasis:names:tc:SAML:1.0:am:password" />
+            </list>
+        </property>
+    </bean>
 
     <!-- Defaulted flows. -->
     
@@ -271,30 +290,11 @@
         </property>
     </bean>
 
-    <!-- A parent bean to default some of the flow boilerplate. -->
-
-    <bean id="shibboleth.AuthenticationFlow" abstract="true"
-            class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
-            p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
-            p:nonBrowserSupported="true"
-            p:passiveAuthenticationSupported="false"
-            p:forcedAuthenticationSupported="false"
-            p:proxyRestrictionsEnforced="%{idp.authn.enforceProxyRestrictions:true}"
-            p:lifetime="%{idp.authn.defaultLifetime:PT60M}"
-            p:inactivityTimeout="%{idp.authn.defaultTimeout:PT30M}"
-            p:principalWeightMap="#{getObject('shibboleth.AuthenticationPrincipalWeightMap') ?: getObject('shibboleth.DefaultAuthenticationPrincipalWeightMap')}"
-            p:principalServiceManager-ref="shibboleth.PrincipalServiceManager">
-        <property name="supportedPrincipals">
-            <list>
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
-                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
-                <bean parent="shibboleth.SAML1AuthenticationMethod"
-                    c:method="urn:oasis:names:tc:SAML:1.0:am:password" />
-            </list>
-        </property>
-    </bean>
+    <!-- Management bean to collect and expose AuthenticationFlowDescriptors. -->
+    
+    <bean id="shibboleth.AuthenticationFlowDescriptorManager"
+        class="net.shibboleth.idp.authn.impl.AuthenticationFlowDescriptorManager"
+        p:components="#{getObject('shibboleth.AvailableAuthenticationFlows')}" />
 
     <!-- Default weighting if not overridden. -->
     <util:map id="shibboleth.DefaultAuthenticationPrincipalWeightMap">

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