[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: Sat Feb 22 05:34:33 2014
New Revision: 5443

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5443&view=rev
Log:
IdP 359 SAML1 flows for Transient, CryptoTransient and Directr NameIdentifier C14N

Added:
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-transient-subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-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
    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-flow.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=5443&r1=5442&r2=5443&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Sat Feb 22 05:34:33 2014
@@ -34,7 +34,7 @@
             </property>
         </bean>
         
-        
+       
         <bean c:id="SubjectC14NFlow/SAML2/Transient" class="net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor"> 
             <property name="activationCondition">
                 <bean
@@ -73,6 +73,46 @@
                 </util:list>
             </property>
         </bean>
+        
+               
+        <bean c:id="SubjectC14NFlow/SAML1/Transient" class="net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor"> 
+            <property name="activationCondition">
+                <bean
+                    class="net.shibboleth.idp.saml.impl.nameid.NameIdentifierCanonicalization.ActivationCondition" />
+            </property>
+            <property name="formats">
+                <util:list>
+                    <value>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</value>
+                    <value>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</value>
+                </util:list>
+            </property>
+        </bean>
+
+        <bean c:id="SubjectC14NFlow/SAML1/CryptoTransient" class="net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor"> 
+            <property name="activationCondition">
+                <bean
+                    class="net.shibboleth.idp.saml.impl.nameid.NameIdentifierCanonicalization.ActivationCondition" />
+            </property>
+            <property name="formats">
+                <util:list>
+                    <value>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</value>
+                    <value>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</value>
+                </util:list>
+            </property>
+        </bean>
+
+        <bean c:id="SubjectC14NFlow/SAML1/Direct" class="net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor"> 
+            <property name="activationCondition">
+                <bean
+                    class="net.shibboleth.idp.saml.impl.nameid.NameIdentifierCanonicalization.ActivationCondition" />
+            </property>
+            <property name="formats">
+                <util:list>
+                    <value>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</value>
+                    <value>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</value>
+                </util:list>
+            </property>
+        </bean>
 
         <bean c:id="SubjectC14NFlow/LegacyPrincipalConnector" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
             <property name="activationCondition">

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=5443&r1=5442&r2=5443&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Sat Feb 22 05:34:33 2014
@@ -47,9 +47,14 @@
         
         <!-- C14N methods. -->
         <webflow:flow-location id="SubjectC14NFlow/Simple" path="/c14n/simple-subject-c14n-flow.xml" />
+        

[... 56 lines stripped ...]