[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/saml-nameid.properties conf/saml-nameid.x...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 19 20:07:23 2014
New Revision: 7204

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7204&view=rev
Log:
Switch persistent ID source IDs to a comma-delimited list for consistency.

Modified:
    trunk/idp-conf/src/main/resources/conf/saml-nameid.properties
    trunk/idp-conf/src/main/resources/conf/saml-nameid.xml
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/saml-nameid.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/saml-nameid.properties?rev=7204&r1=7203&r2=7204&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/saml-nameid.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/saml-nameid.properties Fri Dec 19 20:07:23 2014
@@ -11,8 +11,8 @@
 # Set this to null to skip hash-based generation of first stored ID
 #idp.persistentId.computed = shibboleth.ComputedPersistentIdGenerator
 
-# Otherwise for computed PersistentIDs set the source attribute(s) and salt.
-#idp.persistentId.sourceAttribute = 'changethistosomethingreal'
+# Otherwise for computed PersistentIDs set the source attribute and salt.
+#idp.persistentId.sourceAttribute = changethistosomethingreal
 #idp.persistentId.salt = changethistosomethingrandom
 #idp.persistentId.algorithm = SHA
 

Modified: trunk/idp-conf/src/main/resources/conf/saml-nameid.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/saml-nameid.xml?rev=7204&r1=7203&r2=7204&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/saml-nameid.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/saml-nameid.xml Fri Dec 19 20:07:23 2014
@@ -33,7 +33,7 @@
     
         <ref bean="shibboleth.SAML2TransientGenerator" />
         
-        <!-- Uncommenting this bean also requires uncommenting some idp.properties. -->
+        <!-- Uncommenting this bean requires configuration in saml-nameid.properties. -->
         <!--
         <ref bean="shibboleth.SAML2PersistentGenerator" />
         -->

Modified: trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml?rev=7204&r1=7203&r2=7204&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml Fri Dec 19 20:07:23 2014
@@ -19,16 +19,19 @@
     <bean id="shibboleth.SAML1AttributeSourcedGenerator" abstract="true"
         class="net.shibboleth.idp.saml.nameid.impl.AttributeSourcedSAML1NameIdentifierGenerator" />
 
-    <!-- The actual plugins for generarating transient and persistent identifiers. -->
+    <!-- The actual plugins for generating transient and persistent identifiers. -->
 
     <bean id="shibboleth.SAML2TransientGenerator"
         class="net.shibboleth.idp.saml.nameid.impl.TransientSAML2NameIDGenerator"
         p:transientIdGenerator-ref="%{idp.transientId.generator:shibboleth.CryptoTransientIdGenerator}" />
 
     <bean id="shibboleth.SAML2PersistentGenerator" lazy-init="true"
-        class="net.shibboleth.idp.saml.nameid.impl.PersistentSAML2NameIDGenerator"
-        p:attributeSourceIds="#{ { %{idp.persistentId.sourceAttribute:} } }"
-        p:persistentIdGenerator-ref="%{idp.persistentId.generator:shibboleth.ComputedPersistentIdGenerator}" />
+            class="net.shibboleth.idp.saml.nameid.impl.PersistentSAML2NameIDGenerator"
+            p:persistentIdGenerator-ref="%{idp.persistentId.generator:shibboleth.ComputedPersistentIdGenerator}">
+        <property name="attributeSourceIds">
+            <bean parent="shibboleth.CommaDelimStringArray" c:_0="%{idp.persistentId.sourceAttribute:}" />
+        </property>
+    </bean>
 
     <bean id="shibboleth.SAML1TransientGenerator"
         class="net.shibboleth.idp.saml.nameid.impl.TransientSAML1NameIdentifierGenerator"