Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Seamless support for Groovy bean definitions mixed with XML bean definitions

Browse Source 
GroovyBeanDefinitionReader and Groovy ApplicationContexts redirect ".xml" files to XmlBeanDefinitionReader now, similar to what they've been doing for importBeans directives already. Analogously, @ImportResource for configuration classes redirects ".groovy" to GroovyBeanDefinitionReader now.

Issue: SPR-11924
This commit is contained in:
Juergen Hoeller
2014-06-30 22:53:25 +02:00
parent 06d3e1b94e
commit 37ba1b966e
5 changed files with 91 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/web/context/support/GroovyWebApplicationContext.java
View File

@@ -30,8 +30,8 @@ import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
/**
* {@link org.springframework.web.context.WebApplicationContext} implementation
* which takes its configuration from Groovy bean definition scripts, understood by
* {@link org.springframework.web.context.WebApplicationContext} implementation which takes
* its configuration from Groovy bean definition scripts and/or XML files, as understood by
* an {@link org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader}.
* This is essentially the equivalent of
* {@link org.springframework.context.support.GenericGroovyApplicationContext}
@@ -46,7 +46,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
* init-param of {@link org.springframework.web.servlet.FrameworkServlet}. Config locations
* can either denote concrete files like "/WEB-INF/context.groovy" or Ant-style patterns
* like "/WEB-INF/*-context.groovy" (see {@link org.springframework.util.PathMatcher}
* javadoc for pattern details).
* javadoc for pattern details). Note that ".xml" files will be parsed as XML content;
* all other kinds of resources will be parsed as Groovy scripts.
*
* <p>Note: In case of multiple config locations, later bean definitions will
* override ones defined in earlier loaded files. This can be leveraged to
@@ -119,7 +120,7 @@ public class GroovyWebApplicationContext extends AbstractRefreshableWebApplicati
* therefore this method is just supposed to load and/or register bean definitions.
* <p>Delegates to a ResourcePatternResolver for resolving location patterns
* into Resource instances.
* @throws IOException if the required Groovy script isn't found
* @throws IOException if the required Groovy script or XML file isn't found
* @see #refreshBeanFactory
* @see #getConfigLocations
* @see #getResources