[java-identity-provider COMMIT] in /trunk: idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/Main.java...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Nov 11 09:22:35 2013
New Revision: 4942

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4942&view=rev
Log:
IdP-298 Baby steps towards using only Spring resources in the IdP.  Make idp-attribute-cli use spring resources only.  Plus support in Springutils

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

Modified: trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/Main.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/Main.java?rev=4942&r1=4941&r2=4942&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/Main.java (original)
+++ trunk/idp-attribute-cli/src/main/java/net/shibboleth/idp/attribute/cli/Main.java Mon Nov 11 09:22:35 2013
@@ -25,13 +25,12 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.spring.SpringSupport;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.resource.FilesystemResource;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
 import org.springframework.webflow.executor.FlowExecutionResult;
 import org.springframework.webflow.executor.FlowExecutor;
 import org.springframework.webflow.test.MockExternalContext;
@@ -125,16 +124,11 @@
                 errorAndExit("Configuration file " + config.getAbsolutePath() + " is a directory or is not readable",
                         null);
             }
-            Resource r = new FilesystemResource(config.getPath());
-            try {
-                r.initialize();
-            } catch (ComponentInitializationException e) {
-                errorAndExit("Configuration resource " + config.getPath() + " failed to initialize", e);
-            }
+            Resource r = new FileSystemResource(config.getPath());
             configs.add(r);
         }
                 
-        return SpringSupport.newContext(Main.class.getName(), configs, null);
+        return SpringSupport.newContextSpring(Main.class.getName(), configs, null);
     }
     
     /**

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=4942&r1=4941&r2=4942&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 Mon Nov 11 09:22:35 2013
@@ -85,6 +85,30 @@
     }
 
     /**
+     * Creates a new, started, application context from the given configuration resources.
+     * 
+     * @param name name of the application context
+     * @param configurationResources configuration resources
+     * @param parentContext parent context, or null if there is no parent
+     * 
+     * @return the created context
+     */
+    public static GenericApplicationContext newContextSpring(String name,
+            List<org.springframework.core.io.Resource> configurationResources, ApplicationContext parentContext) {
+        GenericApplicationContext context = new GenericApplicationContext(parentContext);
+        context.setDisplayName("ApplicationContext:" + name);
+
+        SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
+                new SchemaTypeAwareXMLBeanDefinitionReader(context);
+
+        beanDefinitionReader.loadBeanDefinitions(configurationResources
+                .toArray(new org.springframework.core.io.Resource[] {}));
+
+        context.refresh();
+        return context;
+    }
+
+    /**
      * Parse list of elements into bean definitions.
      * 
      * @param elements list of elements to parse