[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/authn-comparison.xml system/conf/ge...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jun 10 23:12:14 2014
New Revision: 6075

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6075&view=rev
Log:
Refactor authn config some more.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml
    trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml?rev=6075&r1=6074&r2=6075&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml Tue Jun 10 23:12:14 2014
@@ -7,91 +7,60 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
-    These beans can be used in the AuthnComparisonRegistry bean below instead of the defaults to
+    These beans can be used in the AuthnComparisonRules map below instead of the defaults to
     support more advanced matching rules. The top example shows how to configure a matching rule,
     in this case a rule that the two listed classes are "better" than the password class.
     
-    A map can contain any number of <entry> elements.
-    
-    To use these beans, configure the matchingRules property as desired, and then reference the bean id in the
-    desired value-ref slot in the AuthnComparisonRegistry.
+    To use these beans, configure the matchingRules map as desired, and then reference the bean id in the
+    desired value-ref slot in the AuthnComparisonRules map.
     -->
     
-    <bean id="shibboleth.BetterClassRefMatchFactory" class="net.shibboleth.idp.authn.principal.impl.InexactPrincipalEvalPredicateFactory">
+    <bean id="shibboleth.BetterClassRefMatchFactory" parent="shibboleth.InexactMatchFactory">
         <!--
         <property name="matchingRules">
-            <map>
+            <util:map>
                 <entry key="urn:oasis:names:tc:SAML:2.0:ac:classes:Password">
                     <list>
                         <value>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</value>
                         <value>urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken</value>
                     </list>
                 </entry>
-            </map>
+            </util:map>
         </property>
         -->
     </bean>
 
-    <bean id="shibboleth.BetterDeclRefMatchFactory" class="net.shibboleth.idp.authn.principal.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.BetterDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
 
-    <bean id="shibboleth.MinimumClassRefMatchFactory" class="net.shibboleth.idp.authn.principal.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.MinimumClassRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
 
-    <bean id="shibboleth.MinimumDeclRefMatchFactory" class="net.shibboleth.idp.authn.principal.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.MinimumDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
 
-    <bean id="shibboleth.MaximumClassRefMatchFactory" class="net.shibboleth.idp.authn.principal.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.MaximumClassRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
 
-    <bean id="shibboleth.MaximumDeclRefMatchFactory" class="net.shibboleth.idp.authn.principal.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.MaximumDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
     
     
-    <!-- Registry of objects implementing matching rules. -->
-    <bean id="shibboleth.AuthnComparisonRegistry" class="net.shibboleth.idp.authn.principal.PrincipalEvalPredicateFactoryRegistry">
-        <constructor-arg>
-            <map>
-                <!-- Exact matching, this can be left as-is. -->
-                <entry key-ref="shibboleth.SAMLACClassRefExact" value-ref="shibboleth.ExactMatchFactory"/>
-                <entry key-ref="shibboleth.SAMLACDeclRefExact" value-ref="shibboleth.ExactMatchFactory"/>
+    <!-- Registry of matching rules. -->
+    
+    <util:map id="shibboleth.AuthnComparisonRules">
+    
+        <!-- Exact matching, this can be left as-is. -->
+        <entry key-ref="shibboleth.SAMLACClassRefExact" value-ref="shibboleth.ExactMatchFactory"/>
+        <entry key-ref="shibboleth.SAMLACDeclRefExact" value-ref="shibboleth.ExactMatchFactory"/>
 
-                <!-- Minimum matching, leave to allow degeneration into exact, or replace with custom rules. -->
-                <entry key-ref="shibboleth.SAMLACClassRefMinimum" value-ref="shibboleth.ExactMatchFactory"/>
-                <entry key-ref="shibboleth.SAMLACDeclRefMinimum" value-ref="shibboleth.ExactMatchFactory"/>

[... 103 lines stripped ...]