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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jun  8 12:33:07 2014
New Revision: 6058

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6058&view=rev
Log:
Better handling of missing data source in config.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-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=6058&r1=6057&r2=6058&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Sun Jun  8 12:33:07 2014
@@ -47,11 +47,13 @@
 idp.transientId.generator = shibboleth.CryptoTransientIdGenerator
 
 # Set to shibboleth.StoredPersistentIdGenerator for server-side storage
+# and uncomment/name the DataSource to use. Otherwise set the source
+# attribute and salt below.
 idp.persistentId.generator = shibboleth.ComputedPersistentIdGenerator
+#idp.persistentId.store = PersistentIdStore
 idp.persistentId.sourceAttribute = changethistosomethingreal
 idp.persistentId.salt = changethistosomethingrandom
 idp.persistentId.algorithm = SHA
-idp.persistentId.store = PersistentIdStore
 
 # Comment out to disable legacy NameID generation via Attribute Resolver
 idp.nameid.saml2.legacyGenerator = shibboleth.LegacySAML2NameIDGenerator
@@ -108,7 +110,7 @@
 
 # Relying Party resolver
 idp.service.relyingparty.failFast=false
-idp.service.relyingparty.checkInterval=0
+idp.service.relyingparty.checkInterval=PT5M
 
 # Metadata resolver
 idp.service.metadata.failFast=false

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=6058&r1=6057&r2=6058&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 Sun Jun  8 12:33:07 2014
@@ -65,7 +65,7 @@
     <bean id="shibboleth.StoredPersistentIdGenerator" lazy-init="true"
         class="net.shibboleth.idp.saml.nameid.impl.StoredPersistentIdGenerationStrategy"
         p:computedIdStrategy-ref="shibboleth.ComputedPersistentIdGenerator"
-        p:IDStore-ref="${idp.persistentId.store}" />
+        p:IDStore="#{getObject('${idp.persistentId.store:null}')}" />
     
     <!-- These two beans handle legacy support for NameID generation in the Attribute Resolver. -->
     <bean id="shibboleth.LegacySAML1NameIdentifierGenerator"

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml?rev=6058&r1=6057&r2=6058&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml Sun Jun  8 12:33:07 2014
@@ -38,7 +38,7 @@
             class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization" scope="prototype">
         <property name="decoder">
             <bean class="net.shibboleth.idp.saml.nameid.impl.StoredPersistentIdDecoder"
-                p:persistentIdStore-ref="${idp.persistentId.store}" />
+                p:persistentIdStore="#{getObject('${idp.persistentId.store:null}')}" />
         </property>
     </bean>