cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lgaw...@apache.org
Subject svn commit: r471479 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java
Date Sun, 05 Nov 2006 17:53:57 GMT
Author: lgawron
Date: Sun Nov  5 09:53:56 2006
New Revision: 471479

URL: http://svn.apache.org/viewvc?view=rev&rev=471479
Log:
probably a little bit over engineered...

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=471479&r1=471478&r2=471479
==============================================================================
--- 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 09:53:56 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 = this.readConfiguration(location, resourceLoader);
+            final ConfigurationInfo info = ConfigurationReader.readConfiguration(location,
resourceLoader);
 
             this.createComponents(element,
                                   info,
@@ -134,11 +134,6 @@
         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) {



Mime
View raw message