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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 10 13:44:09 2013
New Revision: 5021

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5021&view=rev
Log:
IDP-330 Synch With Test bed - missed files.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/global-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=5021&r1=5020&r2=5021&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Dec 10 13:44:09 2013
@@ -54,3 +54,20 @@
 # Whether to prioritize "active" results when an SP requests more than
 # one possible matching login method (V2 behavior was to favor them)
 idp.authn.favorSSO = false
+
+# LDAP authentication configuration
+# uses the in-memory directory by default, see src/test/config/ldap.ldif
+idp.authn.ldap.ldapUrl = ldap://localhost:10389
+idp.authn.ldap.baseDn = ou=people,dc=shibboleth,dc=net
+idp.authn.ldap.subtreeSearch = false
+idp.authn.ldap.userFilter = (uid={user})
+
+# Reload "failfast" (stop the IdP if a configuration is bad)
+# and reload check interval (0 == never reload). Specified in milliseconds
+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

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5021&r1=5020&r2=5021&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Tue Dec 10 13:44:09 2013
@@ -26,15 +26,16 @@
 
     <import resource="session-manager.xml" />
     
-    <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop">
-        <property name="id" value="shibboleth.LogbackLogging" />
-        <property name="loggingConfiguration">
-            <bean class="net.shibboleth.utilities.java.support.resource.FilesystemResource" c:resourcePath="${idp.home}/conf/logback.xml" />
-        </property>
-        <property name="reloadCheckDelay" value="0" />
-    </bean>
+    <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->
     
-    <bean id="shibboleth.OpensamlConfig" class="net.shibboleth.idp.conf.OpensamlConfigBean"
+    <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop"
+          p:id="shibboleth.LogbackLogging"
+          p:loggingConfiguration="file:${idp.home}/conf/logback.xml"
+          p:reloadCheckDelay="${idp.service.logging.checkInterval}"
+          p:reloadTaskTimer-ref="shibboleth.TaskTimer"
+          p:failFast="${idp.service.logging.failFast}"/>
+    
+    <bean id="shibboleth.OpensamlConfig" class="common.OpensamlConfigBean"
         depends-on="shibboleth.LogbackLogging" p:parserPool-ref="shibboleth.ParserPool" />
 
     <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean" depends-on="shibboleth.LogbackLogging">
@@ -104,8 +105,9 @@
     <bean id="shibboleth.UnmarshallerFactory" factory-method="getUnmarshallerFactory" class="org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport" depends-on="shibboleth.OpensamlConfig" />
 
     <bean id="shibboleth.CookieManager" class="net.shibboleth.utilities.java.support.net.CookieManager"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse" />
-        
+        p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse"
+        p:secure="false" />
+    
     <bean id="shibboleth.DataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer"
         p:keystoreType="${idp.sealer.storeType}"
         p:keystorePath="${idp.home}/${idp.sealer.storePath}"
@@ -119,8 +121,36 @@
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse"
         p:cookieManager-ref="shibboleth.CookieManager"
         p:dataSealer-ref="shibboleth.DataSealer" />
-
+    
     <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LogbackLogging"
         p:storage-ref="shibboleth.StorageService" p:strict="true" />
 
-</beans>

[... 30 lines stripped ...]