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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Feb 10 09:18:26 2014
New Revision: 5350

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5350&view=rev
Log:
IDP-359 Add configuration for old style PrincipalConnector C14N and new style C14N (SAML2/Transient)

Added:
    trunk/idp-conf/src/main/resources/system/flows/c14n/legacy-pc-subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/legacy-pc-subject-c14n-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-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

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=5350&r1=5349&r2=5350&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Mon Feb 10 09:18:26 2014
@@ -33,6 +33,19 @@
                 <bean class="net.shibboleth.idp.authn.impl.SimpleSubjectCanonicalization.ActivationCondition" />
             </property>
         </bean>
+        
+        <bean c:id="SubjectC14NFlow/SAML2/Transient" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
+            <property name="activationCondition">
+                <bean class="net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization.ActivationCondition" />
+            </property>
+        </bean>
+        
+        <bean c:id="SubjectC14NFlow/LegacyPrincipalConnector" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
+            <property name="activationCondition">
+                <bean class="net.shibboleth.idp.saml.impl.nameid.LegacyCanonicalization.ActivationCondition" 
+                c:service-ref="shibboleth.AttributeResolverService"/>
+            </property>
+        </bean>
 
     </util:list>
     

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=5350&r1=5349&r2=5350&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Mon Feb 10 09:18:26 2014
@@ -47,6 +47,8 @@
         
         <!-- C14N methods. -->
         <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"  />
+        <webflow:flow-location id="SubjectC14NFlow/LegacyPrincipalConnector" path="/c14n/legacy-pc-subject-c14n-flow.xml"  />
                 
     </webflow:flow-registry>