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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jan 30 12:19:21 2014
New Revision: 5278

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5278&view=rev
Log:
Add rest of SAML constants, and simplify flow config using parent bean.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.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=5278&r1=5277&r2=5278&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 Thu Jan 30 12:19:21 2014
@@ -21,12 +21,31 @@
     be used, regardless any other files loaded by the Spring container.
     -->
 
+    <!-- First we define a parent bean to default some of the boilerplate. -->
+    <bean id="shibboleth.AbstractAuthenticationFlowBean" abstract="true"
+            class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
+            p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
+            p:passiveAuthenticationSupported="false"
+            p:forcedAuthenticationSupported="false"
+            p:lifetime="${idp.authn.defaultLifetime}" p:inactivityTimeout="${idp.authn.defaultTimeout}">
+        <property name="supportedPrincipals">
+            <list>
+                <bean class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal"
+                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
+                <bean class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal"
+                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
+                <bean class="net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal"
+                    c:method="urn:oasis:names:tc:SAML:1.0:am:password" />
+            </list>
+        </property>
+    </bean>
+
+
+    <!-- Now the actual list. -->
     <util:list id="shibboleth.AvailableAuthenticationFlows">
         
-        <bean c:id="AuthenticationFlow/IPAddress" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
-                p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
+        <bean c:id="AuthenticationFlow/IPAddress" parent="shibboleth.AbstractAuthenticationFlowBean"
                 p:passiveAuthenticationSupported="true"
-                p:forcedAuthenticationSupported="false"
                 p:lifetime="PT60S" p:inactivityTimeout="PT60S">
             <property name="supportedPrincipals">
                 <list>
@@ -36,58 +55,18 @@
             </property>
         </bean>
         
-        <bean c:id="AuthenticationFlow/RemoteUser" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
-                p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
-                p:passiveAuthenticationSupported="false"
-                p:forcedAuthenticationSupported="true"
-                p:lifetime="${idp.authn.defaultLifetime}" p:inactivityTimeout="${idp.authn.defaultTimeout}">
-            <property name="supportedPrincipals">
-                <list>
-                    <bean class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
-                    <bean class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
-                    <bean class="net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal"
-                        c:method="urn:oasis:names:tc:SAML:1.0:am:password" />
-                </list>
-            </property>
-        </bean>
+        <bean c:id="AuthenticationFlow/RemoteUser" parent="shibboleth.AbstractAuthenticationFlowBean" />
 
-        <bean c:id="AuthenticationFlow/JAAS" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
-                p:resultSerializer-ref="shibboleth.DefaultAuthenticationResultSerializer"
+        <bean c:id="AuthenticationFlow/JAAS" parent="shibboleth.AbstractAuthenticationFlowBean"
                 p:passiveAuthenticationSupported="true"
-                p:forcedAuthenticationSupported="true"
-                p:lifetime="${idp.authn.defaultLifetime}" p:inactivityTimeout="${idp.authn.defaultTimeout}">
-            <property name="supportedPrincipals">
-                <list>
-                    <bean class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal"
-                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
-                    <bean class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal"

[... 92 lines stripped ...]