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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug  4 11:58:05 2014
New Revision: 6392

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6392&view=rev
Log:
Improve some comments, and redo some property handling.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/saml-nameid.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.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=6392&r1=6391&r2=6392&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Aug  4 11:58:05 2014
@@ -66,14 +66,15 @@
 #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 IDs set the source attribute and salt.
-idp.persistentId.sourceAttribute = changethistosomethingreal
-idp.persistentId.salt = changethistosomethingrandom
+
+# 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
+#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

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=6392&r1=6391&r2=6392&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/saml-nameid.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/saml-nameid.xml Mon Aug  4 11:58:05 2014
@@ -21,7 +21,7 @@
 
     <!--
     These generator lists handle NameID/Nameidentifier generation going forward. By default,
-    transient IDs for both SAML versions are enabled. The other examples are for persistent IDs
+    transient IDs for both SAML versions are enabled. The commented examples are for persistent IDs
     and generating more one-off formats based on resolved attributes. The suggested approach is to
     control their use via release of the underlying source attribute in the filter policy rather
     than here, but you can set a property on any generator called "activationCondition" to limit
@@ -30,17 +30,24 @@
     Most of the relevant configuration settings are controlled using properties; an exception is
     the generation of arbitrary/custom formats based on attribute information, examples of which
     are shown below.
+    
     -->
     
     <!-- SAML 2 NameID Generation -->
     <util:list id="shibboleth.SAML2NameIDGenerators">
     
         <ref bean="shibboleth.SAML2TransientGenerator" />
+        
+        <!-- Uncommenting this bean also requires uncommenting some idp.properties. -->
+        <!--
         <ref bean="shibboleth.SAML2PersistentGenerator" />
+        -->
 
+        <!--
         <bean parent="shibboleth.SAML2AttributeSourcedGenerator"
             p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
             p:attributeSourceIds="#{ {'email'} }" />
+        -->
                 
     </util:list>
 
@@ -49,9 +56,11 @@
 
         <ref bean="shibboleth.SAML1TransientGenerator" />
 
+        <!--
         <bean parent="shibboleth.SAML1AttributeSourcedGenerator"
             p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
             p:attributeSourceIds="#{ {'email'} }" />
+        -->
                 
     </util:list>
     

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=6392&r1=6391&r2=6392&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml Mon Aug  4 11:58:05 2014
@@ -18,6 +18,7 @@
     <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->

[... 74 lines stripped ...]