You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2006/11/05 19:06:23 UTC
svn commit: r471483 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java
Author: lgawron
Date: Sun Nov 5 10:06:23 2006
New Revision: 471483
URL: http://svn.apache.org/viewvc?view=rev&rev=471483
Log:
I have tossed some crap into the fan. AGAIN.
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java?view=diff&rev=471483&r1=471482&r2=471483
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java Sun Nov 5 10:06:23 2006
@@ -69,7 +69,7 @@
// the schema for the sitemap element ensures that location is never null.
final String location = this.getAttributeValue(element, "location", DEFAULT_COCOON_XCONF_LOCATION);
try {
- final ConfigurationInfo info = ConfigurationReader.readConfiguration(location, resourceLoader);
+ final ConfigurationInfo info = this.readConfiguration(location, resourceLoader);
this.createComponents(element,
info,
@@ -134,6 +134,11 @@
beanDef.getPropertyValues().addPropertyValue("location", this.getConfigurationLocation());
this.register(beanDef, AvalonBeanPostProcessor.class.getName(), registry);
+ }
+
+ protected ConfigurationInfo readConfiguration(String location, ResourceLoader resourceLoader)
+ throws Exception {
+ return ConfigurationReader.readConfiguration(location, resourceLoader);
}
protected void addContext(Element element, BeanDefinitionRegistry registry) {