[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/subject-config.xml conf/webflow-config.xm...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr 23 15:30:59 2014
New Revision: 5766

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5766&view=rev
Log:
Collapse all the default SAML c14n subflows into one.

Added:
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/legacy-pc-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/legacy-pc-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-transient-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-direct-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-direct-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-persistent-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-persistent-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/subject-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/subject-config.xml?rev=5766&r1=5765&r2=5766&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Wed Apr 23 15:30:59 2014
@@ -104,10 +104,10 @@
         <ref bean="SubjectC14NFlow/LegacyPrincipalConnector" />
         
         <!-- The next four are for handling transient IDs (in-storage and stateless variants). -->
-        <ref bean="SubjectC14NFlow/SAML2/Transient" />
-        <ref bean="SubjectC14NFlow/SAML2/CryptoTransient" />
-        <ref bean="SubjectC14NFlow/SAML1/Transient" /> 
-        <ref bean="SubjectC14NFlow/SAML1/CryptoTransient" /> 
+        <ref bean="SubjectC14NFlow/SAML2Transient" />
+        <ref bean="SubjectC14NFlow/SAML2CryptoTransient" />
+        <ref bean="SubjectC14NFlow/SAML1Transient" /> 
+        <ref bean="SubjectC14NFlow/SAML1CryptoTransient" /> 
         
         <!-- Handle a SAML 2 persistent ID, provided a stored strategy is in use. -->
         <!-- <ref bean="SubjectC14NFlow/SAML2/Persistent" /> -->
@@ -116,8 +116,8 @@
         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/SAML2/Direct" />
-        <ref bean="SubjectC14NFlow/SAML1/Direct" />
+        <ref bean="SubjectC14NFlow/SAML2Direct" />
+        <ref bean="SubjectC14NFlow/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=5766&r1=5765&r2=5766&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Wed Apr 23 15:30:59 2014
@@ -64,19 +64,22 @@
         <webflow:flow-location id="SubjectC14N/Authn" path="/c14n/subject-c14n-authn-flow.xml" />
         <webflow:flow-location id="SubjectC14N/SAML" path="/c14n/subject-c14n-saml-flow.xml" />
         
-        <!-- C14N methods. -->
+        <!-- Standard post-login C14N method. -->
         <webflow:flow-location id="SubjectC14NFlow/Simple" path="/c14n/simple-subject-c14n-flow.xml" />
         
-        <webflow:flow-location id="SubjectC14NFlow/SAML2/Transient" path="/c14n/saml2-transient-subject-c14n-flow.xml"  />

[... 70 lines stripped ...]