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

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Dec 30 17:55:44 2013
New Revision: 5111

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5111&view=rev
Log:
Remove unnecessary newContextSpring() method from SpringSupport as part of cleanup following IDP-298 work, which was to use Spring Resources in the IdP rather than java-support Resources.

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=5111&r1=5110&r2=5111&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 Dec 30 17:55:44 2013
@@ -128,7 +128,7 @@
             configs.add(r);
         }
                 
-        return SpringSupport.newContextSpring(Main.class.getName(), configs, null);
+        return SpringSupport.newContext(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=5111&r1=5110&r2=5111&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 Dec 30 17:55:44 2013
@@ -65,30 +65,6 @@
     }
 
     /**
-     * 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