[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/flows/saml/saml1/ss...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jun 20 17:56:55 2014
New Revision: 6132

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6132&view=rev
Log:
Default more properties.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.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=6132&r1=6131&r2=6132&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Fri Jun 20 17:56:55 2014
@@ -70,8 +70,8 @@
 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
+#idp.nameid.saml2.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+#idp.nameid.saml1.default = urn:mace:shibboleth:1.0:nameIdentifier
 
 # Size of session IDs
 #idp.session.idSize = 32

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=6132&r1=6131&r2=6132&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Fri Jun 20 17:56:55 2014
@@ -32,7 +32,7 @@
             class="org.opensaml.saml.saml1.profile.impl.AddNameIdentifierToSubjects" scope="prototype">
         <property name="formatLookupStrategy">
             <bean class="net.shibboleth.idp.saml.profile.logic.DefaultNameIdentifierFormatStrategy"
-                p:defaultFormat="${idp.nameid.saml1.default}" />
+                p:defaultFormat="${idp.nameid.saml1.default:urn:mace:shibboleth:1.0:nameIdentifier}" />
         </property>
         <property name="nameIdentifierGenerator">
             <bean class="net.shibboleth.idp.saml.nameid.impl.ProxySAML1NameIdentifierGenerator"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=6132&r1=6131&r2=6132&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Fri Jun 20 17:56:55 2014
@@ -31,7 +31,7 @@
             class="org.opensaml.saml.saml2.profile.impl.AddNameIDToSubjects" scope="prototype">
         <property name="formatLookupStrategy">
             <bean class="net.shibboleth.idp.saml.profile.logic.DefaultNameIdentifierFormatStrategy"
-                p:defaultFormat="${idp.nameid.saml2.default}" />
+                p:defaultFormat="${idp.nameid.saml2.default:urn:oasis:names:tc:SAML:2.0:nameid-format:transient}" />
         </property>
         <property name="nameIDGenerator">
             <bean class="net.shibboleth.idp.saml.nameid.impl.ProxySAML2NameIDGenerator"