cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lgaw...@apache.org
Subject svn commit: r470855 - in /cocoon/trunk: blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/ blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/ core/cocoon-core/src/main/java/org/apache/coc...
Date Fri, 03 Nov 2006 15:27:09 GMT
Author: lgawron
Date: Fri Nov  3 07:27:08 2006
New Revision: 470855

URL: http://svn.apache.org/viewvc?view=rev&rev=470855
Log:
restructurization

Added:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/
      - copied from r470836, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/
Removed:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/
Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapElementParser.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java?view=diff&rev=470855&r1=470854&r2=470855
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
Fri Nov  3 07:27:08 2006
@@ -95,9 +95,9 @@
         final Properties mergedProps = new Properties();
         
         //TODO change when location of files change
-        ResourceUtils.readProperties("classpath*:META-INF/spring", mergedProps, this.resourceLoader,
+        ResourceUtils.readProperties("classpath*:META-INF/cocoon/spring", mergedProps, this.resourceLoader,
                 this.logger);
-        ResourceUtils.readProperties("classpath*:META-INF/spring/" + mode, mergedProps,
+        ResourceUtils.readProperties("classpath*:META-INF/cocoon/spring/" + mode, mergedProps,
                 this.resourceLoader, this.logger);
 
         ResourceUtils.readProperties(this.location, mergedProps, this.resourceLoader, this.logger);

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java?view=diff&rev=470855&r1=470854&r2=470855
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
Fri Nov  3 07:27:08 2006
@@ -187,9 +187,9 @@
 
         // TODO change this when properties location changes
         // now read all properties from the properties directory
-        ResourceUtils.readProperties("classpath*:META-INF/properties", properties, this.getResourceLoader(),
this.logger);
+        ResourceUtils.readProperties("classpath*:META-INF/cocoon/properties", properties,
this.getResourceLoader(), this.logger);
         // read all properties from the mode dependent directory
-        ResourceUtils.readProperties("classpath*:META-INF/properties/" + mode, properties,
this.getResourceLoader(), this.logger);
+        ResourceUtils.readProperties("classpath*:META-INF/cocoon/properties/" + mode, properties,
this.getResourceLoader(), this.logger);
 
         // now read all properties from the properties directory
         ResourceUtils.readProperties("/WEB-INF/cocoon/properties", properties, this.getResourceLoader(),
this.logger);

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java?view=diff&rev=470855&r1=470854&r2=470855
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
Fri Nov  3 07:27:08 2006
@@ -76,7 +76,7 @@
 
         // handle includes
         // TODO change when location of files change
-        String classPathLocation = "classpath*:META-INF/spring";
+        String classPathLocation = "classpath*:META-INF/cocoon/spring";
         try {
             this.handleBeanInclude(parserContext, null, classPathLocation, "*.xml", true);
         } catch (Exception e) {

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java?view=diff&rev=470855&r1=470854&r2=470855
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
Fri Nov  3 07:27:08 2006
@@ -64,7 +64,7 @@
     protected ConfigurationInfo configurationInfo;
     protected Settings settings = new MutableSettings("test");
     protected ResourceLoader resourceLoader = new DefaultResourceLoader();
-    protected String location = "WEB-INF/cocoon/xconf";
+    protected String location = "WEB-INF/cocoon/avalon";
 
     public void setSettings(Settings settings) {
         this.settings = settings;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapElementParser.java?view=diff&rev=470855&r1=470854&r2=470855
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapElementParser.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapElementParser.java
Fri Nov  3 07:27:08 2006
@@ -70,6 +70,6 @@
     }
 
     protected String getPropertyLocation() {
-        return "config/xconf";
+        return "config/avalon";
     }
 }

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java?view=diff&rev=470855&r1=470854&r2=470855
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
Fri Nov  3 07:27:08 2006
@@ -52,7 +52,7 @@
 
     private static final String CLASSLOADER_CONFIG_NAME = "classloader";
 
-    private static final String DEFAULT_CONFIG_XCONF  = "config/xconf";
+    private static final String DEFAULT_CONFIG_XCONF  = "config/avalon";
 
     protected static String createDefinition(String     uriPrefix,
                                              String     sitemapLocation) {



Mime
View raw message