[java-identity-provider COMMIT] /trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java

[noreply at shibboleth.net]

Author: rdw
Date: Wed Mar 19 13:16:12 2014
New Revision: 5607

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5607&view=rev
Log:
IdP-379 Add the Spring converters to the helper method which summons up ApplicationContexts

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java?rev=5607&r1=5606&r2=5607&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java Wed Mar 19 13:16:12 2014
@@ -23,15 +23,20 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.ext.spring.config.DurationToLongConverter;
+import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ConversionServiceFactoryBean;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.Resource;
 import org.w3c.dom.Element;
+
+import com.google.common.collect.Sets;
 
 /**
  * Helper class for performing some common Spring-related functions.
@@ -56,6 +61,13 @@
         GenericApplicationContext context = new GenericApplicationContext(parentContext);
         context.setDisplayName("ApplicationContext:" + name);
 
+        ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
+        service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter()));
+        service.afterPropertiesSet();
+
+        context.getBeanFactory().setConversionService(service.getObject());
+
+        
         SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
                 new SchemaTypeAwareXMLBeanDefinitionReader(context);