[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 16:38:37 2014
New Revision: 6871

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6871&view=rev
Log:
Add properties for the service resource sets to use.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/services.properties
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    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=6871&r1=6870&r2=6871&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Nov 10 16:38:37 2014
@@ -1,4 +1,4 @@
-# Load any additional property resources in a comma-delimited list
+# Load any additional property resources from a comma-delimited list
 idp.additionalProperties = /conf/ldap.properties, /conf/saml-nameid.properties, /conf/services.properties
 
 # Set the entityID of the IdP
@@ -64,9 +64,6 @@
 # Set if a different default view name for events and exceptions is needed
 #idp.errors.defaultView = error
 
-# Time in seconds between if-modified checks of message property source(s)
-#idp.errors.cacheSeconds = 300
-
 # Set to false to disable the IdP session layer
 #idp.session.enabled = true
 
@@ -93,7 +90,7 @@
 # Select alternate implementation for step that determines what results are active
 #idp.session.activeResultExtraction = net.shibboleth.idp.session.impl.ExtractActiveAuthenticationResults
 
-# Regular expression matching login flows to enable 
+# Regular expression matching login flows to enable, e.g. IPAddress|Password
 idp.authn.flows = Password
 
 # Regular expression of forced "initial" methods when no session exists,

Modified: trunk/idp-conf/src/main/resources/conf/services.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.properties?rev=6871&r1=6870&r2=6871&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties Mon Nov 10 16:38:37 2014
@@ -1,35 +1,37 @@
-# Configure reloading policy and failure handling for service configurations.
+# Configure the resources to load for various services,
+# and the settings for failure handling and auto-reload.
 
 # failFast=true prevents IdP startup if a configuration is bad
-# checkInterval=0 means never reload
+# checkInterval=0 means never reload (this is the property default)
 
 #idp.service.logging.failFast=true
-#idp.service.logging.checkInterval=PT5M
+idp.service.logging.checkInterval=PT5M
 
-# Relying Party resolver
+# Set to shibboleth.LegacyRelyingPartyResolverResources with legacy V2 relying-party.xml
+#idp.service.relyingparty.resources=shibboleth.RelyingPartyResolverResources
 #idp.service.relyingparty.failFast=false
 idp.service.relyingparty.checkInterval=PT5M
-# When true, enables support for a legacy V2 relying-party.xml
-#idp.service.relyingparty.legacy=false
 
-# Metadata resolver
+#idp.service.metadata.resources=shibboleth.MetadataResolverResources
 #idp.service.metadata.failFast=false
 #idp.service.metadata.checkInterval=PT15M
 
-# Attribute resolver
+#idp.service.attribute.resolver.resources=shibboleth.AttributeResolverResources
 #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.resources=shibboleth.AttributeFilterResources
+# NOTE: 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.resources=shibboleth.NameIdentifierGenerationResources
 #idp.service.nameidGeneration.failFast=false
 idp.service.nameidGeneration.checkInterval=PT5M
 
-# Admin access control
+#idp.service.access.resources=shibboleth.AccessControlResources
 #idp.service.access.failFast=true
 idp.service.access.checkInterval=PT5M
 
+#idp.message.resources=shibboleth.MessageSourceResources
+#idp.message.cacheSeconds = 300

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=6871&r1=6870&r2=6871&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Mon Nov 10 16:38:37 2014
@@ -59,16 +59,14 @@
     property sources.
     -->
 

[... 171 lines stripped ...]