You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2007/10/04 11:16:59 UTC
svn commit: r581809 -
/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java
Author: cziegeler
Date: Thu Oct 4 02:16:58 2007
New Revision: 581809
URL: http://svn.apache.org/viewvc?rev=581809&view=rev
Log:
Resource loader should always be set.
Modified:
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java?rev=581809&r1=581808&r2=581809&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java Thu Oct 4 02:16:58 2007
@@ -104,7 +104,7 @@
public static ConfigurationInfo readConfiguration(Configuration rolesConfig,
Configuration componentConfig)
throws Exception {
- final ConfigurationReader converter = new ConfigurationReader(null, null);
+ final ConfigurationReader converter = new ConfigurationReader(null, new DefaultResourceLoader());
converter.convert(rolesConfig, componentConfig, null);
return converter.configInfo;
}
@@ -113,11 +113,7 @@
ResourceLoader resourceLoader)
throws Exception {
this.isRootContext = parentInfo == null;
- if ( resourceLoader != null ) {
- this.resolver = new ServletContextResourcePatternResolver(resourceLoader);
- } else {
- this.resolver = new ServletContextResourcePatternResolver(new DefaultResourceLoader());
- }
+ this.resolver = new ServletContextResourcePatternResolver(resourceLoader);
// now add selectors from parent
if ( parentInfo != null ) {