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/04 15:00:08 UTC
svn commit: r471190 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java
Author: lgawron
Date: Sat Nov 4 06:00:07 2006
New Revision: 471190
URL: http://svn.apache.org/viewvc?view=rev&rev=471190
Log:
extract constant
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=471190&r1=471189&r2=471190
==============================================================================
--- 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 Sat Nov 4 06:00:07 2006
@@ -58,7 +58,8 @@
* @since 2.2
*/
public class AvalonElementParser extends AbstractElementParser {
-
+ public static final String DEFAULT_COCOON_XCONF_LOCATION = "resource://org/apache/cocoon/cocoon.xconf";
+
/**
* @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
*/
@@ -66,10 +67,10 @@
final ResourceLoader resourceLoader = parserContext.getReaderContext().getReader().getResourceLoader();
// read avalon style configuration - it's optional for this element.
// the schema for the sitemap element ensures that location is never null.
- final String location = this.getAttributeValue(element, "location", "resource://org/apache/cocoon/cocoon.xconf");
+ final String location = this.getAttributeValue(element, "location", DEFAULT_COCOON_XCONF_LOCATION);
try {
final ConfigurationInfo info = this.readConfiguration(location, resourceLoader);
-
+
this.createComponents(element,
info,
parserContext.getRegistry(),