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

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 30 12:24:28 2014
New Revision: 6007

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6007&view=rev
Log:
Add a custom ApplicationContext type to handle file resources.

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=6007&r1=6006&r2=6007&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 30 12:24:28 2014
@@ -28,7 +28,9 @@
 
 import net.shibboleth.ext.spring.config.DurationToLongConverter;
 import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
+import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.xml.SerializeSupport;
 import net.shibboleth.utilities.java.support.xml.XmlConstants;
 
@@ -58,11 +60,11 @@
 public final class SpringSupport {
 
     /** Spring beans element name. */
-    public static final QName SPRING_BEANS_ELEMENT_NAME = new QName("http://www.springframework.org/schema/beans",
-            "beans");
+    @Nonnull public static final QName SPRING_BEANS_ELEMENT_NAME =
+            new QName("http://www.springframework.org/schema/beans", "beans");
 
-    /** Log. */
-    static final Logger LOG = LoggerFactory.getLogger(SpringSupport.class);
+    /** Logger. */
+    @Nonnull static final Logger LOG = LoggerFactory.getLogger(SpringSupport.class);
 
     /** Constructor. */
     private SpringSupport() {
@@ -77,11 +79,12 @@
      * 
      * @return the created context
      */
-    public static GenericApplicationContext newContext(String name, List<Resource> configurationResources,
-            ApplicationContext parentContext) {
-        GenericApplicationContext context = new GenericApplicationContext(parentContext);
+    @Nonnull public static GenericApplicationContext newContext(@Nonnull @NotEmpty final String name,
+            @Nonnull @NonnullElements final List<Resource> configurationResources,
+            @Nullable final ApplicationContext parentContext) {
+        GenericApplicationContext context = new FilesystemGenericApplicationContext(parentContext);
         context.setDisplayName("ApplicationContext:" + name);
-
+        
         ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
         service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter()));
         service.afterPropertiesSet();
@@ -165,7 +168,7 @@
             }
         }
 
-        final GenericApplicationContext ctx = new GenericApplicationContext();
+        final GenericApplicationContext ctx = new FilesystemGenericApplicationContext();
         parseNativeElement(springBeans, ctx);
         ctx.refresh();
         return ctx.getBeanFactory();
@@ -191,4 +194,5 @@
         }
         return bean;
     }
+    
 }