[utilities COMMIT] in /spring-extensions/trunk/src: main/java/net/shibboleth/ext/spring/service/ReloadableSpringServi...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jul 23 11:43:55 2014
New Revision: 635

URL: http://svn.shibboleth.net/view/utilities?rev=635&view=rev
Log:
IDP-436 Generate credentials using properties from idp.properties via Spring and provide a Windows .bat file to do so. The creds.bat and creds.sh scripts call GenerateCredentials which instantiates an application context from conf/generate-credentials.xml. Lower the abstraction level of the IdP application context initializer to work with non-web application contexts. Add initializers as a parameter to creation of new contexts in SpringSupport.

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java?rev=635&r1=634&r2=635&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java Wed Jul 23 11:43:55 2014
@@ -42,6 +42,7 @@
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.Lifecycle;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.Resource;
@@ -296,7 +297,8 @@
         final GenericApplicationContext appContext;
         try {
             appContext =
-                    SpringSupport.newContext(getId(), getServiceConfigurations(), postProcessors, getParentContext());
+                    SpringSupport.newContext(getId(), getServiceConfigurations(), postProcessors,
+                            Collections.<ApplicationContextInitializer> emptyList(), getParentContext());
         } catch (FatalBeanException e) {
             throw new ServiceException(e);
         }

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java?rev=635&r1=634&r2=635&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java Wed Jul 23 11:43:55 2014
@@ -48,6 +48,7 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.support.ConversionServiceFactoryBean;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.Resource;
@@ -82,6 +83,7 @@
      * @param name name of the application context
      * @param configurationResources configuration resources
      * @param postProcessors post processors to inject
+     * @param initializers application context initializers
      * @param parentContext parent context, or null if there is no parent
      * 
      * @return the created context
@@ -89,6 +91,7 @@
     @Nonnull public static GenericApplicationContext newContext(@Nonnull @NotEmpty final String name,
             @Nonnull @NonnullElements final List<Resource> configurationResources,
             @Nonnull @NonnullElements final List<BeanPostProcessor> postProcessors,
+            @Nonnull @NonnullElements final List<ApplicationContextInitializer> initializers,
             @Nullable final ApplicationContext parentContext) {
         GenericApplicationContext context = new FilesystemGenericApplicationContext(parentContext);
         context.setDisplayName("ApplicationContext:" + name);
@@ -107,6 +110,13 @@
                 new SchemaTypeAwareXMLBeanDefinitionReader(context);
 
         beanDefinitionReader.loadBeanDefinitions(configurationResources.toArray(new Resource[] {}));
+
+        if (initializers != null) {
+            for (ApplicationContextInitializer initializer : initializers) {
+                initializer.initialize(context);
+            }
+        }
+
         context.refresh();
         return context;
     }

Modified: spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java

[... 39 lines stripped ...]