cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lgaw...@apache.org
Subject svn commit: r471171 - in /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring: Constants.java SitemapElementParser.java SubSettingsBeanFactoryPostProcessor.java
Date Sat, 04 Nov 2006 11:59:15 GMT
Author: lgawron
Date: Sat Nov  4 03:59:14 2006
New Revision: 471171

URL: http://svn.apache.org/viewvc?view=rev&rev=471171
Log:
constants organized

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Constants.java?view=diff&rev=471171&r1=471170&r2=471171
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
Sat Nov  4 03:59:14 2006
@@ -30,5 +30,6 @@
     public static final String DEFAULT_BEAN_OVERRIDE_PROPERTIES_LOCATION = "classpath*:META-INF/cocoon/spring";
 
     /** The default location of spring related per sitemap configuration files. */
-    public static final String DEFAULT_SPRING_SITEMAP_CONFIGURATION_FILES = "config/spring";
+    public static final String DEFAULT_SITEMAP_SPRING_CONFIGURATION_LOCATION = "config/spring";
+    public static final String DEFAULT_SITEMAP_PROPERTIES_LOCATION = "config/properties";
 }

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java?view=diff&rev=471171&r1=471170&r2=471171
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
Sat Nov  4 03:59:14 2006
@@ -127,7 +127,7 @@
 
             // register a PropertyPlaceholderConfigurer
             if ( useDefaultIncludes ) {
-                this.registerPropertyOverrideConfigurer(parserContext, Constants.DEFAULT_SPRING_SITEMAP_CONFIGURATION_FILES);
+                this.registerPropertyOverrideConfigurer(parserContext, Constants.DEFAULT_SITEMAP_SPRING_CONFIGURATION_LOCATION);
             }
             
             RootBeanDefinition def =  this.createBeanDefinition(SubSettingsBeanFactoryPostProcessor.class.getName(),
@@ -147,7 +147,7 @@
             }
 
             if ( useDefaultIncludes ) {
-                this.handleBeanInclude(parserContext, null, Constants.DEFAULT_SPRING_SITEMAP_CONFIGURATION_FILES,
"*.xml", true);
+                this.handleBeanInclude(parserContext, null, Constants.DEFAULT_SITEMAP_SPRING_CONFIGURATION_LOCATION,
"*.xml", true);
             }
             // search for includes
             if ( componentsElement != null ) {

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java?view=diff&rev=471171&r1=471170&r2=471171
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
Sat Nov  4 03:59:14 2006
@@ -39,8 +39,6 @@
 public class SubSettingsBeanFactoryPostProcessor
     extends AbstractSettingsBeanFactoryPostProcessor {
 
-    private static final String DEFAULT_CONFIG_PROPERTIES = "config/properties";
-
     protected String location;
 
     protected List directories;
@@ -106,9 +104,9 @@
 
         // read properties from default includes
         if ( this.useDefaultIncludes ) {
-            ResourceUtils.readProperties(DEFAULT_CONFIG_PROPERTIES, properties, this.getResourceLoader(),
this.logger);
+            ResourceUtils.readProperties(Constants.DEFAULT_SITEMAP_PROPERTIES_LOCATION, properties,
this.getResourceLoader(), this.logger);
             // read all properties from the mode dependent directory
-            ResourceUtils.readProperties(DEFAULT_CONFIG_PROPERTIES + '/' + mode, properties,
this.getResourceLoader(), this.logger);    
+            ResourceUtils.readProperties(Constants.DEFAULT_SITEMAP_PROPERTIES_LOCATION +
'/' + mode, properties, this.getResourceLoader(), this.logger);    
         }
 
         if ( this.directories != null ) {



Mime
View raw message