[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/ldap.properties idp-conf/src/main/resourc...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 12 18:34:20 2014
New Revision: 7083

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7083&view=rev
Log:
IDP-539 - Fix metadata parsers and tests to allow for no injected Timer, and finally pull the Timer bean.

Modified:
    trunk/idp-conf/src/main/resources/conf/ldap.properties
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractReloadingMetadataProviderParser.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicBasicParams.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain-svc.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/multipleResolvers.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/serviceBeans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/beans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/chainingbeans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/services.xml

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Fri Dec 12 18:34:20 2014
@@ -5,7 +5,7 @@
 
 ## Connection properties ##
 idp.authn.LDAP.ldapURL							= ldap://localhost:10389
-idp.authn.LDAP.useStartTLS						= true
+idp.authn.LDAP.useStartTLS						= false
 idp.authn.LDAP.useSSL							= false
 idp.authn.LDAP.connectTimeout					= 3000
 

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=7083&r1=7082&r2=7083&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 Fri Dec 12 18:34:20 2014
@@ -50,12 +50,11 @@
     <import resource="cas-protocol-system.xml" />
     <import resource="utilities.xml" />
 
-    <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.spring.OpenSAMLConfigBean"
         depends-on="shibboleth.LogbackLogging,shibboleth.ParserPool" p:parserPool-ref="shibboleth.ParserPool" />
 
-    <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean" depends-on="shibboleth.LogbackLogging">
+    <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean"
+            depends-on="shibboleth.LogbackLogging">
         <property name="overrideLogging" value="false"/>
         <property name="velocityProperties">
             <props>

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicMetadataProviderParser.java?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicMetadataProviderParser.java Fri Dec 12 18:34:20 2014
@@ -31,9 +31,6 @@
     
     /** The reference to the system parser pool that we set up. */
     private static final String DEFAULT_PARSER_POOL_REF = "shibboleth.ParserPool";
-
-    /** The reference to the system wide timer that we set up. */
-    private static final String DEFAULT_TIMER_REF = "shibboleth.TaskTimer";
     
     /** The default delay factor. */
     private static final String DEFAULT_DELAY_FACTOR = "0.75";
@@ -49,7 +46,12 @@
             BeanDefinitionBuilder builder) {
 

[... 265 lines stripped ...]