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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 19 22:57:15 2013
New Revision: 5067

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5067&view=rev
Log:
Move Principal interfaces/classes into subpackages.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn-comparison.xml
    trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn-comparison.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn-comparison.xml?rev=5067&r1=5066&r2=5067&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn-comparison.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn-comparison.xml Thu Dec 19 22:57:15 2013
@@ -17,7 +17,7 @@
     desired value-ref slot in the AuthnComparisonRegistry.
     -->
     
-    <bean id="shibboleth.BetterClassRefMatchFactory" class="net.shibboleth.idp.authn.impl.InexactPrincipalEvalPredicateFactory">
+    <bean id="shibboleth.BetterClassRefMatchFactory" class="net.shibboleth.idp.authn.impl.principal.InexactPrincipalEvalPredicateFactory">
         <!--
         <property name="matchingRules">
             <map>
@@ -32,19 +32,19 @@
         -->
     </bean>
 
-    <bean id="shibboleth.BetterDeclRefMatchFactory" class="net.shibboleth.idp.authn.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.BetterDeclRefMatchFactory" class="net.shibboleth.idp.authn.impl.principal.InexactPrincipalEvalPredicateFactory"/>
 
-    <bean id="shibboleth.MinimumClassRefMatchFactory" class="net.shibboleth.idp.authn.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.MinimumClassRefMatchFactory" class="net.shibboleth.idp.authn.impl.principal.InexactPrincipalEvalPredicateFactory"/>
 
-    <bean id="shibboleth.MinimumDeclRefMatchFactory" class="net.shibboleth.idp.authn.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.MinimumDeclRefMatchFactory" class="net.shibboleth.idp.authn.impl.principal.InexactPrincipalEvalPredicateFactory"/>
 
-    <bean id="shibboleth.MaximumClassRefMatchFactory" class="net.shibboleth.idp.authn.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.MaximumClassRefMatchFactory" class="net.shibboleth.idp.authn.impl.principal.InexactPrincipalEvalPredicateFactory"/>
 
-    <bean id="shibboleth.MaximumDeclRefMatchFactory" class="net.shibboleth.idp.authn.impl.InexactPrincipalEvalPredicateFactory"/>
+    <bean id="shibboleth.MaximumDeclRefMatchFactory" class="net.shibboleth.idp.authn.impl.principal.InexactPrincipalEvalPredicateFactory"/>
     
     
     <!-- Registry of objects implementing matching rules. -->
-    <bean id="shibboleth.AuthnComparisonRegistry" class="net.shibboleth.idp.authn.PrincipalEvalPredicateFactoryRegistry">
+    <bean id="shibboleth.AuthnComparisonRegistry" class="net.shibboleth.idp.authn.principal.PrincipalEvalPredicateFactoryRegistry">
         <constructor-arg>
             <map>
                 <!-- Exact matching, this can be left as-is. -->
@@ -68,30 +68,30 @@
 
     <!-- Boilerplate objects needed to key the installation of matching rules in the registry. -->
     <bean id="shibboleth.SAMLACClassRefExact" class="net.shibboleth.utilities.java.support.collection.Pair"
-        p:first="#{ T(net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal) }" p:second="exact"/>
+        p:first="#{ T(net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal) }" p:second="exact"/>
 
     <bean id="shibboleth.SAMLACDeclRefExact" class="net.shibboleth.utilities.java.support.collection.Pair"
-        p:first="#{ T(net.shibboleth.idp.saml.authn.AuthnContextDeclRefPrincipal) }" p:second="exact"/>
+        p:first="#{ T(net.shibboleth.idp.saml.authn.principal.AuthnContextDeclRefPrincipal) }" p:second="exact"/>
 
     <bean id="shibboleth.SAMLACClassRefMinimum" class="net.shibboleth.utilities.java.support.collection.Pair"
-        p:first="#{ T(net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal) }" p:second="minimum"/>
+        p:first="#{ T(net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal) }" p:second="minimum"/>
 
     <bean id="shibboleth.SAMLACDeclRefMinimum" class="net.shibboleth.utilities.java.support.collection.Pair"
-        p:first="#{ T(net.shibboleth.idp.saml.authn.AuthnContextDeclRefPrincipal) }" p:second="minimum"/>
+        p:first="#{ T(net.shibboleth.idp.saml.authn.principal.AuthnContextDeclRefPrincipal) }" p:second="minimum"/>
 
     <bean id="shibboleth.SAMLACClassRefMaximum" class="net.shibboleth.utilities.java.support.collection.Pair"
-        p:first="#{ T(net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal) }" p:second="maximum"/>
+        p:first="#{ T(net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal) }" p:second="maximum"/>
 
     <bean id="shibboleth.SAMLACDeclRefMaximum" class="net.shibboleth.utilities.java.support.collection.Pair"

[... 95 lines stripped ...]