cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r312930 - in /cocoon: blocks/portal/trunk/java/org/apache/cocoon/portlet/ trunk/src/java/org/apache/cocoon/ trunk/src/java/org/apache/cocoon/components/treeprocessor/ trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ trunk/...
Date Tue, 11 Oct 2005 18:14:12 GMT
Author: cziegeler
Date: Tue Oct 11 11:13:35 2005
New Revision: 312930

URL: http://svn.apache.org/viewcvs?rev=312930&view=rev
Log:
Implement global reload settings

Modified:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java
    cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
    cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java
    cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java
    cocoon/trunk/src/java/org/apache/cocoon/core/DynamicSettings.java
    cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java
    cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java
    cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java
    cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
    cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java
    cocoon/trunk/src/webapp/WEB-INF/properties/core.properties
    cocoon/trunk/src/webapp/stylesheets/system/status2html.xslt

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java Tue Oct
11 11:13:35 2005
@@ -73,7 +73,7 @@
             s.setLoggerManagerClassName(value);
         }
 
-        s.setAllowReload(getInitParameterAsBoolean(config, "allow-reload", s.isAllowReload()));
+        s.setReloadingEnabled(getInitParameterAsBoolean(config, "allow-reload", s.isReloadingEnabled(null)));
 
         handleLoadClass(getInitParameter(config, "load-class"), s);
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Tue Oct 11 11:13:35 2005
@@ -234,7 +234,7 @@
             URLSource urlSource = new URLSource();
             urlSource.init(new URL(settings.getConfiguration()), null);
             this.configurationFile = new DelayedRefreshSourceWrapper(urlSource,
-                                                                     settings.getConfigurationReloadDelay());
+                                                                     settings.getReloadDelay("config"));
 
         } catch (IOException e) {
             throw new ConfigurationException(

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Tue
Oct 11 11:13:35 2005
@@ -48,6 +48,7 @@
 import org.apache.cocoon.components.source.SourceUtil;
 import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper;
 import org.apache.cocoon.components.treeprocessor.sitemap.FlowNode;
+import org.apache.cocoon.core.Core;
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.environment.internal.EnvironmentHelper;
 import org.apache.cocoon.sitemap.SitemapExecutor;
@@ -93,6 +94,9 @@
      */
     protected ServiceManager manager;
 
+    /** The core object. */
+    protected Core core;
+
     /** Last modification time */
     protected long lastModified = 0;
 
@@ -155,6 +159,7 @@
 
         this.resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
         this.fam = (SitemapMonitor) this.manager.lookup(SitemapMonitor.ROLE);
+        this.core = (Core) this.manager.lookup(Core.ROLE);
         this.environmentHelper = new EnvironmentHelper(parent.environmentHelper);
         // Setup environment helper
         ContainerUtil.enableLogging(this.environmentHelper, this.getLogger());
@@ -191,6 +196,7 @@
         this.manager = manager;
         this.resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
         this.fam = (SitemapMonitor) this.manager.lookup(SitemapMonitor.ROLE);
+        this.core = (Core) this.manager.lookup(Core.ROLE);
     }
 
     /**
@@ -233,14 +239,15 @@
     public void configure(Configuration config)
     throws ConfigurationException {
 
-        this.checkReload = config.getAttributeAsBoolean("check-reload", true);
+        this.checkReload = config.getAttributeAsBoolean("check-reload",
+                             this.core.getSettings().isReloadingEnabled("sitemap"));
 
         // Obtain the configuration file, or use the XCONF_URL if none
         // is defined
         String xconfURL = config.getAttribute("config", XCONF_URL);
 
         // Reload check delay. Default is 1 second.
-        this.lastModifiedDelay = config.getChild("reload").getAttributeAsLong("delay", 1000L);
+        this.lastModifiedDelay = config.getChild("reload").getAttributeAsLong("delay", this.core.getSettings().getReloadDelay("sitemap"));
 
         String fileName = config.getAttribute("file", "sitemap.xmap");
         
@@ -780,8 +787,10 @@
             }
             this.manager.release(this.fam);
             this.manager.release(this.resolver);
+            this.manager.release(this.core);
             this.resolver = null;
             this.manager = null;
+            this.core = null;
         }
     }
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
Tue Oct 11 11:13:35 2005
@@ -33,7 +33,7 @@
  *
  * @author <a href="mailto:bluetkemeier@s-und-n.de">Bj&ouml;rn L&uuml;tkemeier</a>
  * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id$
+ * @version $Id$
  */
 public class MountNode extends AbstractProcessingNode
                        implements Disposable {

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java
Tue Oct 11 11:13:35 2005
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,18 +16,22 @@
 package org.apache.cocoon.components.treeprocessor.sitemap;
 
 import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.components.treeprocessor.AbstractProcessingNodeBuilder;
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.core.Core;
 
 /**
  *
  * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id$
+ * @version $Id$
  */
 
-public class MountNodeBuilder extends AbstractProcessingNodeBuilder implements ThreadSafe
{
+public class MountNodeBuilder
+    extends AbstractProcessingNodeBuilder
+    implements ThreadSafe {
 
     /** This builder has no parameters -- return <code>false</code> */
     protected boolean hasParameters() {
@@ -35,12 +39,12 @@
     }
 
     public ProcessingNode buildNode(Configuration config) throws Exception {
-
+        final Core core = (Core)manager.lookup(Core.ROLE);
         MountNode node = new MountNode(
             VariableResolverFactory.getResolver(config.getAttribute("uri-prefix"), manager),
             VariableResolverFactory.getResolver(config.getAttribute("src"), manager),
             this.treeBuilder.getProcessor().getWrappingProcessor(),
-            config.getAttributeAsBoolean("check-reload", true),
+            config.getAttributeAsBoolean("check-reload", core.getSettings().isReloadingEnabled("sitemap")),
             config.getAttributeAsBoolean("pass-through", false)
         );
   

Modified: cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java Tue Oct 11 11:13:35 2005
@@ -763,7 +763,7 @@
         // set the blocks classloader for this thread
         Thread.currentThread().setContextClassLoader(this.classloader);        
         
-        if (this.settings.isAllowReload()) {
+        if (this.settings.isReloadingEnabled("config")) {
             boolean reload = false;
 
             if (this.cocoon != null) {

Modified: cocoon/trunk/src/java/org/apache/cocoon/core/DynamicSettings.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/DynamicSettings.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/DynamicSettings.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/DynamicSettings.java Tue Oct 11 11:13:35
2005
@@ -28,12 +28,12 @@
 public interface DynamicSettings {
 
     /**
-     * Default value for {@link #isAllowReload()} parameter (false)
+     * Default value for {@link #isReloadingEnabled(String)} parameter (false).
      */
-    boolean ALLOW_RELOAD = false;
+    boolean RELOADING_ENABLED_DEFAULT = false;
 
     /**
-     * Default value for {@link #isEnableUploads()} parameter (false)
+     * Default value for {@link #isEnableUploads()} parameter (false).
      */
     boolean ENABLE_UPLOADS = false;
     boolean SAVE_UPLOADS_TO_DISK = true;
@@ -43,7 +43,7 @@
     boolean HIDE_SHOW_TIME = false;
 
     /**
-     * Default value for {@link #isShowCocoonVersion()} parameter (true)
+     * Default value for {@link #isShowVersion()} parameter (true).
      */
     boolean SHOW_COCOON_VERSION = true;
 
@@ -115,13 +115,25 @@
      * @return Returns the showCocoonVersion.
      * @see #KEY_SHOW_VERSION
      */
-    boolean isShowCocoonVersion();
+    boolean isShowVersion();
 
     /**
-     * @return Returns the allowReload.
+     * This method can be used by components to query if they are
+     * configured to check for reloading.
+     * @param type The type of the component that wants to check for reload.
+     * @return Returns if reloading is enabled for this component.
      * @see #KEY_RELOADING
      */
-    boolean isAllowReload();
+    boolean isReloadingEnabled(String type);
+
+    /**
+     * This method can be used by components to get the configured
+     * delay period inbetween checks.
+     * @param type The type of the component that wants to check for reload.
+     * @return Returns the delay inbetween checks in milliseconds.
+     * @see #KEY_RELOAD_DELAY
+     */
+    long getReloadDelay(String type);
 
     /**
      * @return Returns the autosaveUploads.
@@ -152,12 +164,6 @@
      * @see #KEY_SHOWTIME
      */
     boolean isShowTime();
-
-    /**
-     * @return Returns the configurationReloadDelay.
-     * @see #KEY_RELOAD_DELAY
-     */
-    long getConfigurationReloadDelay();
 
     /**
      * @return Returns the lazyMode.

Modified: cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java Tue Oct 11 11:13:35
2005
@@ -95,7 +95,7 @@
      * the request parameter "cocoon-reload". It also enables that Cocoon is
      * reloaded when cocoon.xconf changes. Default is no for security reasons.
      */
-    protected boolean allowReload = ALLOW_RELOAD;
+    protected boolean reloadingEnabled = RELOADING_ENABLED_DEFAULT;
 
     /**
      * This parameter is used to list classes that should be loaded at
@@ -258,7 +258,7 @@
                     } else if ( key.equals(KEY_LOGGING_MANAGER_CLASS) ) {
                         this.loggerManagerClassName = value;
                     } else if ( key.equals(KEY_RELOADING) ) {
-                        this.allowReload = BooleanUtils.toBoolean(value);
+                        this.reloadingEnabled = BooleanUtils.toBoolean(value);
                     } else if ( key.equals(KEY_UPLOADS_ENABLE) ) {
                         this.enableUploads = BooleanUtils.toBoolean(value);
                     } else if ( key.equals(KEY_UPLOADS_DIRECTORY) ) {
@@ -315,8 +315,15 @@
     /**
      * @return Returns the allowReload.
      */
-    public boolean isAllowReload() {
-        return this.allowReload;
+    public boolean isReloadingEnabled(String type) {
+        boolean result = this.reloadingEnabled;
+        if ( type != null ) {
+            String o = this.getProperty(KEYPREFIX + KEY_RELOADING + '.' + type);
+            if ( o != null ) {
+                result = BooleanUtils.toBoolean(o);
+            }
+        }
+        return result;
     }
 
     /**
@@ -441,7 +448,7 @@
     /**
      * @return Returns the showCocoonVersion flag.
      */
-    public boolean isShowCocoonVersion() {
+    public boolean isShowVersion() {
         return this.showCocoonVersion;
     }
 
@@ -498,8 +505,15 @@
     /**
      * @return Returns the configurationReloadDelay.
      */
-    public long getConfigurationReloadDelay() {
-        return configurationReloadDelay;
+    public long getReloadDelay(String type) {
+        long value = this.configurationReloadDelay;
+        if ( type != null ) {
+            String o = this.getProperty(KEYPREFIX + KEY_RELOAD_DELAY + '.' + type);
+            if ( o != null ) {
+                value = NumberUtils.toLong(o);
+            }
+        }
+        return value;
     }
 
     /**
@@ -535,7 +549,7 @@
             } else if ( sKey.equals(KEY_LOGGING_MANAGER_CLASS) ) {
                 value = this.loggerManagerClassName;
             } else if ( sKey.equals(KEY_RELOADING) ) {
-                value = String.valueOf(this.allowReload);
+                value = String.valueOf(this.reloadingEnabled);
             } else if ( sKey.equals(KEY_UPLOADS_ENABLE) ) {
                 value = String.valueOf(this.enableUploads);
             } else if ( sKey.equals(KEY_UPLOADS_DIRECTORY) ) {
@@ -595,7 +609,7 @@
           "Running mode : " + this.getProperty(PROPERTY_RUNNING_MODE, DEFAULT_RUNNING_MODE)
+ '\n' +
           KEY_CONFIGURATION + " : " + this.configuration + '\n' +
           KEY_RELOAD_DELAY + " : " + this.configurationReloadDelay + '\n' +
-          KEY_RELOADING + " : " + this.allowReload + '\n' +
+          KEY_RELOADING + " : " + this.reloadingEnabled + '\n' +
           KEY_EXTRA_CLASSPATHS + " : " + this.toString(this.extraClasspaths) + '\n' +
           KEY_LOAD_CLASSES + " : " + this.toString(this.loadClasses) + '\n' +
           KEY_FORCE_PROPERTIES + " : " + this.toString(this.forceProperties) + '\n' +
@@ -672,9 +686,9 @@
     /**
      * @param allowReload The allowReload to set.
      */
-    public void setAllowReload(boolean allowReload) {
+    public void setReloadingEnabled(boolean allowReload) {
         this.checkWriteable();
-        this.allowReload = allowReload;
+        this.reloadingEnabled = allowReload;
     }
 
     /**
@@ -920,5 +934,23 @@
     public void addToPropertyProviders(String className) {
         this.checkWriteable();
         this.propertyProviders.add(className);
+    }
+
+    /**
+     * @see org.apache.cocoon.core.Settings#getProperties(java.lang.String)
+     */
+    public List getProperties(String keyPrefix) {
+        final List props = new ArrayList();
+        for(int i=0; i<this.properties.size(); i++) {
+            final Properties p = (Properties)this.properties.get(i);
+            final Iterator kI = p.keySet().iterator();
+            while ( kI.hasNext() ) {
+                final String name = (String)kI.next();
+                if ( name.startsWith(keyPrefix) && !props.contains(name) ) {
+                    props.add(name);
+                }
+            }
+        }
+        return props;
     }
 }

Modified: cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java Tue Oct 11 11:13:35 2005
@@ -15,6 +15,8 @@
  */
 package org.apache.cocoon.core;
 
+import java.util.List;
+
 /**
  * This object holds the global configuration of Cocoon.
  *
@@ -23,8 +25,27 @@
  */
 public interface Settings extends BaseSettings, DynamicSettings {
 
-    String getProperty(String name);
+    /**
+     * Get the value of a property.
+     * @param key The name of the property.
+     * @return The value of the property or null.
+     */
+    String getProperty(String key);
 
+    /**
+     * Get the value of a property.
+     * @param key The name of the property.
+     * @param defaultValue The value returned if the property is not available.
+     * @return The value of the property or if the property cannot
+     *         be found the default value.
+     */
     String getProperty(String key, String defaultValue);
 
+    /**
+     * Return all available properties starting with the prefix.
+     * @param keyPrefix The prefix each property name must have.
+     * @return A list of property names (including the prefix) or
+     *         an empty list.
+     */
+    List getProperties(String keyPrefix);
 }

Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java Tue Oct 11 11:13:35
2005
@@ -499,15 +499,27 @@
 
         this.startGroup("Dynamic Settings");
 
-        this.addValue(Settings.KEY_RELOAD_DELAY, s.getConfigurationReloadDelay());
-        this.addValue(Settings.KEY_RELOADING, s.isAllowReload());
+        this.addValue(Settings.KEY_RELOADING, s.isReloadingEnabled(null));
+        this.addValue(Settings.KEY_RELOAD_DELAY, s.getReloadDelay(null));
+        Iterator i = s.getProperties("org.apache.cocoon." + Settings.KEY_RELOADING + '.').iterator();
+        while ( i.hasNext() ) {
+            final String key = (String)i.next();
+            final String value = s.getProperty(key);
+            this.addValue(key.substring(18), value);
+        }
+        i = s.getProperties("org.apache.cocoon." + Settings.KEY_RELOAD_DELAY + '.').iterator();
+        while ( i.hasNext() ) {
+            final String key = (String)i.next();
+            final String value = s.getProperty(key);
+            this.addValue(key.substring(18), value);
+        }
         this.addValue(Settings.KEY_UPLOADS_AUTOSAVE, s.isAutosaveUploads());
         this.addValue(Settings.KEY_UPLOADS_ENABLE, s.isEnableUploads());
         this.addValue(Settings.KEY_UPLOADS_MAXSIZE, s.getMaxUploadSize());
         this.addValue(Settings.KEY_UPLOADS_OVERWRITE, s.isAllowOverwrite());
         this.addValue(Settings.KEY_SHOWTIME, s.isShowTime());
         this.addValue(Settings.KEY_HIDE_SHOWTIME, s.isHideShowTime());
-        this.addValue(Settings.KEY_SHOW_VERSION, s.isShowCocoonVersion());
+        this.addValue(Settings.KEY_SHOW_VERSION, s.isShowVersion());
         this.addValue(Settings.KEY_LAZY_MODE, s.isLazyMode());
 
         this.endGroup();

Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Tue Oct 11 11:13:35
2005
@@ -263,7 +263,7 @@
         stopWatch.start();
 
         // add the cocoon header timestamp
-        if (this.coreUtil.getSettings().isShowCocoonVersion()) {
+        if (this.coreUtil.getSettings().isShowVersion()) {
             res.addHeader("X-Cocoon-Version", Constants.VERSION);
         }
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java Tue Oct 11 11:13:35
2005
@@ -80,7 +80,7 @@
             s.setLoggerManagerClassName(value);
         }
 
-        s.setAllowReload(getInitParameterAsBoolean(config, "allow-reload", s.isAllowReload()));
+        s.setReloadingEnabled(getInitParameterAsBoolean(config, "allow-reload", s.isReloadingEnabled(null)));
 
         handleLoadClass(getInitParameter(config, "load-class"), s);
 
@@ -126,7 +126,7 @@
             s.setHideShowTime(false);
         }
 
-        s.setShowCocoonVersion(getInitParameterAsBoolean(config, "show-cocoon-version", s.isShowCocoonVersion()));
+        s.setShowCocoonVersion(getInitParameterAsBoolean(config, "show-cocoon-version", s.isShowVersion()));
 
         s.setManageExceptions(getInitParameterAsBoolean(config, "manage-exceptions", s.isManageExceptions()));
 

Modified: cocoon/trunk/src/webapp/WEB-INF/properties/core.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/properties/core.properties?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/properties/core.properties (original)
+++ cocoon/trunk/src/webapp/WEB-INF/properties/core.properties Tue Oct 11 11:13:35 2005
@@ -31,7 +31,8 @@
 org.apache.cocoon.reloading=no
 
 # Turn on reloading for specific parts:
-# org.apache.cocoon.reloading.sitemap=yes
+org.apache.cocoon.reloading.sitemap=yes
+org.apache.cocoon.reload-delay.sitemap=5000
 # org.apache.cocoon.reloading.config=yes
 
 # This parameter switches the logging system from LogKit to Log4J (or

Modified: cocoon/trunk/src/webapp/stylesheets/system/status2html.xslt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/stylesheets/system/status2html.xslt?rev=312930&r1=312929&r2=312930&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/stylesheets/system/status2html.xslt (original)
+++ cocoon/trunk/src/webapp/stylesheets/system/status2html.xslt Tue Oct 11 11:13:35 2005
@@ -41,7 +41,7 @@
         <h1><xsl:value-of select="@status:host"/> - <xsl:value-of select="@status:date"/></h1>
         <h2>Apache Cocoon <xsl:value-of select="@status:cocoon-version"/></h2>
         <li>
-          <span class="description">Instanted:</span>
+          <span class="description">Created:</span>
           <xsl:text> </xsl:text>
           <xsl:value-of select="@status:creation-time"/>
         </li>



Mime
View raw message