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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov 10 11:47:54 2014
New Revision: 6868

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6868&view=rev
Log:
Factor out NameID properties.

Added:
    trunk/idp-conf/src/main/resources/conf/saml-nameid.properties   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-distribution/src/main/resources/bin/build.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=6868&r1=6867&r2=6868&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Nov 10 11:47:54 2014
@@ -1,5 +1,5 @@
 # Load any additional property resources in a comma-delimited list
-idp.additionalProperties = /conf/ldap.properties, /conf/services.properties
+idp.additionalProperties = /conf/ldap.properties, /conf/saml-nameid.properties, /conf/services.properties
 
 # Set the entityID of the IdP
 idp.entityID = https://idp.example.org
@@ -66,29 +66,6 @@
 
 # Time in seconds between if-modified checks of message property source(s)
 #idp.errors.cacheSeconds = 300
-
-# Set to shibboleth.StoredTransientIdGenerator for server-side storage
-#idp.transientId.generator = shibboleth.CryptoTransientIdGenerator
-
-# Set to shibboleth.StoredPersistentIdGenerator for server-side storage
-# and uncomment/name the DataSource to use
-#idp.persistentId.generator = shibboleth.ComputedPersistentIdGenerator
-#idp.persistentId.store = PersistentIdStore
-# 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'
-#idp.persistentId.salt = changethistosomethingrandom
-#idp.persistentId.algorithm = SHA
-
-# Comment out to disable legacy NameID generation via Attribute Resolver
-#idp.nameid.saml2.legacyGenerator = shibboleth.LegacySAML2NameIDGenerator
-#idp.nameid.saml1.legacyGenerator = shibboleth.LegacySAML1NameIdentifierGenerator
-
-# Default NameID formats to use when nothing else is called for
-#idp.nameid.saml2.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-#idp.nameid.saml1.default = urn:mace:shibboleth:1.0:nameIdentifier
 
 # Set to false to disable the IdP session layer
 #idp.session.enabled = true

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=6868&r1=6867&r2=6868&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Mon Nov 10 11:47:54 2014
@@ -36,6 +36,8 @@
             - if idp.scope is present, then this file should contain a line setting idp.scope
         services.merge.properties: The name of a property file to merge with services.properties
         	- if idp.is.V2 is set, then this file should contain a line setting idp.service.relyingparty.legacy=true
+        nameid.merge.properties: The name of a property file to merge with saml-nameid.properties
+        	- if idp.is.V2 is set, then this file should contain lines enabling legacy nameid generation
         idp.property.file: The name of a property file to fill in some or all of the above. This file is deleted after processing.
         idp.no.tidy: Do not delete the two above files (debug only)
         idp.jetty.config: Copy jetty configuration from distribution (Unsupported)
@@ -126,6 +128,10 @@
         <property name="services.merge.properties" value="replace.services.properties" />
     </target>
 
+    <target name="setnameidmerge" unless="nameid.merge.properties.present">
+        <property name="nameid.merge.properties" value="replace.nameid.properties" />
+    </target>
+
 	<target name="target-src-default" unless="idp.src.dir.present">
 		<echo append="true" file="idp_ant.log">target: target-src-default
 		</echo>
@@ -201,6 +207,7 @@
 		</condition>
 		<available property="idp.sealer.present" file="${idp.target.dir}/credentials/sealer.kver" />
 		<available property="idp.properties.present" file="${idp.target.dir}/conf/idp.properties" />
+		<available property="nameid.properties.present" file="${idp.target.dir}/conf/saml-nameid.properties" />
         <available property="ldap.properties.present" file="${idp.target.dir}/conf/ldap.properties" />
 		<available property="services.properties.present" file="${idp.target.dir}/conf/services.properties" />
 		<condition property="idp.will.call.certgen">
@@ -347,11 +354,14 @@
 		<condition property="idp.merge.properties.present">
 			<isset property="idp.merge.properties" />
 	    </condition>	
-		
+

[... 45 lines stripped ...]