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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jun 17 21:22:00 2014
New Revision: 6096

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6096&view=rev
Log:
Adjust some properties

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/services-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=6096&r1=6095&r2=6096&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Jun 17 21:22:00 2014
@@ -95,18 +95,10 @@
 # one possible matching login method (V2 behavior was to favor them)
 idp.authn.favorSSO = false
 
-idp.service.nameidGeneration.checkInterval=PT5M
-
 # Reload "failfast" (stop the IdP if a configuration is bad)
 # and reload check interval (0 == never reload).
 idp.service.logging.failFast=true
 idp.service.logging.checkInterval=PT5M
-idp.service.attribute.resolver.failFast=false
-idp.service.attribute.resolver.checkInterval=PT5M
-
-# Failing the filter fast leaves no filters enabled.
-idp.service.attribute.filter.failFast=false
-idp.service.attribute.filter.checkInterval=PT5M
 
 # Relying Party resolver
 idp.service.relyingparty.failFast=false
@@ -115,6 +107,19 @@
 # Metadata resolver
 idp.service.metadata.failFast=false
 idp.service.metadata.checkInterval=0
+
+# Attribute resolver
+idp.service.attribute.resolver.failFast=false
+idp.service.attribute.resolver.checkInterval=PT5M
+
+# Attribute filter
+# Failing the filter fast leaves no filters enabled.
+idp.service.attribute.filter.failFast=false
+idp.service.attribute.filter.checkInterval=PT5M
+
+# NameID generation
+idp.service.nameidGeneration.failFast=false
+idp.service.nameidGeneration.checkInterval=PT5M
 
 # LDAP attribute configuration, see attribute-resolver.xml
 idp.attribute.resolver.myLDAP.ldapURL             = ldap://localhost:10389

Modified: trunk/idp-conf/src/main/resources/system/conf/services-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/services-system.xml?rev=6096&r1=6095&r2=6096&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/services-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/services-system.xml Tue Jun 17 21:22:00 2014
@@ -42,6 +42,7 @@
           init-method="start" destroy-method="stop"
         c:claz="net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService"
         p:serviceConfigurations-ref="shibboleth.NameIdentifierGenerationResources"
+        p:failFast="${idp.service.nameidGeneration.failFast}"
         p:reloadCheckDelay="${idp.service.nameidGeneration.checkInterval}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />