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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri May 24 15:46:49 2013
New Revision: 4492

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4492&view=rev
Log:
Initialize Resources upon context creation. Maybe resource initialization should be done elsewhere, but it lives here for now.

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=4492&r1=4491&r2=4492&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 Fri May 24 15:46:49 2013
@@ -24,6 +24,7 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.resource.Resource;
 import net.shibboleth.utilities.java.support.resource.ResourceException;
 
@@ -66,10 +67,14 @@
         // beanDefinitionReader.loadBeanDefinitions(configurationResources.toArray(new Resource[] {}));
         try {
             for (Resource configurationResource : configurationResources) {
+
+                // TODO initialize resources here ?
+                configurationResource.initialize();
+
                 beanDefinitionReader.loadBeanDefinitions(new InputStreamResource(
                         configurationResource.getInputStream(), configurationResource.getLocation()));
             }
-        } catch (BeanDefinitionStoreException | ResourceException e) {
+        } catch (BeanDefinitionStoreException | ComponentInitializationException | ResourceException e) {
             // TODO fix exception handling
             e.printStackTrace();
             throw new RuntimeException(e);