[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties conf/subject-c14n-user.xml...

[noreply at shibboleth.net]

Author: scantor
Date: Tue May  6 20:29:58 2014
New Revision: 5861

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5861&view=rev
Log:
Rework c14n flow naming.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=5861&r1=5860&r2=5861&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue May  6 20:29:58 2014
@@ -81,9 +81,6 @@
 # one possible matching login method (V2 behavior was to favor them)
 idp.authn.favorSSO = false
 
-# Regular expression expressing post-login subject c14n flows to enable
-idp.c14n.flows = Simple
-
 # Default NameID formats to use when nothing else is specified
 idp.saml1.nameid.default = urn:mace:shibboleth:1.0:nameIdentifier
 idp.saml2.nameid.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient

Modified: trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml?rev=5861&r1=5860&r2=5861&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml Tue May  6 20:29:58 2014
@@ -28,7 +28,7 @@
         have more complex needs such as mapping a certificate DN into a principal name, an alternative may
         be required.
         -->
-        <bean id="SubjectC14NFlow/Simple" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
+        <bean id="c14n/simple" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
             <property name="activationCondition">
                 <bean class="net.shibboleth.idp.authn.impl.SimpleSubjectCanonicalization.ActivationCondition" />
             </property>
@@ -46,23 +46,23 @@
         to map SAML Subjects back into principals. If you don't use those (or this is a new install) you can
         remove this.
         -->
-        <ref bean="SubjectC14NFlow/LegacyPrincipalConnector" />
+        <ref bean="c14n/LegacyPrincipalConnector" />
         
         <!-- The next four are for handling transient IDs (in-storage and stateless variants). -->
-        <ref bean="SubjectC14NFlow/SAML2Transient" />
-        <ref bean="SubjectC14NFlow/SAML2CryptoTransient" />
-        <ref bean="SubjectC14NFlow/SAML1Transient" /> 
-        <ref bean="SubjectC14NFlow/SAML1CryptoTransient" /> 
+        <ref bean="c14n/SAML2Transient" />
+        <ref bean="c14n/SAML2CryptoTransient" />
+        <ref bean="c14n/SAML1Transient" /> 
+        <ref bean="c14n/SAML1CryptoTransient" /> 
         
         <!-- Handle a SAML 2 persistent ID, provided a stored strategy is in use. -->
-        <!-- <ref bean="SubjectC14NFlow/SAML2/Persistent" /> -->
+        <!-- <ref bean="c14n/SAML2/Persistent" /> -->
         
         <!--
         Finally we have beans for decoding arbitrary SAML formats directly. By default, these are turned off,
         having *no* relying parties for which they apply (see shibboleth.DirectNamePredicate below).
         -->
-        <ref bean="SubjectC14NFlow/SAML2Direct" />
-        <ref bean="SubjectC14NFlow/SAML1Direct" />
+        <ref bean="c14n/SAML2Direct" />
+        <ref bean="c14n/SAML1Direct" />
     </util:list>
     
     <!-- What SAML formats do you want to support direct mapping for? -->

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=5861&r1=5860&r2=5861&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Tue May  6 20:29:58 2014
@@ -55,26 +55,26 @@

[... 270 lines stripped ...]