cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r360082 - in /cocoon: blocks/xsp/trunk/status.xml trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java trunk/src/webapp/WEB-INF/properties/core.properties trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf trunk/status.xml
Date Fri, 30 Dec 2005 13:30:47 GMT
Author: cziegeler
Date: Fri Dec 30 05:30:37 2005
New Revision: 360082

URL: http://svn.apache.org/viewcvs?rev=360082&view=rev
Log:
Use reloading properties in interpreters; update status; correct status entries.

Modified:
    cocoon/blocks/xsp/trunk/status.xml
    cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
    cocoon/trunk/src/webapp/WEB-INF/properties/core.properties
    cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
    cocoon/trunk/status.xml

Modified: cocoon/blocks/xsp/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/status.xml?rev=360082&r1=360081&r2=360082&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/status.xml (original)
+++ cocoon/blocks/xsp/trunk/status.xml Fri Dec 30 05:30:37 2005
@@ -65,6 +65,17 @@
  <!-- The following list contains the changes since the latest 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="AN" type="fix">
+      XSP block: Reintroduce locally scoped xspAttr in xsp.xsl to improve backwards compatibility
for pre-2.1.9
+      logicsheets.  (Suggestion by Vadim Gritsenko).
+    </action>
+    <action dev="AN" type="add">
+      XSP block: Instrument {#expr} interpolation to produce Cocoon stacktrace for parse
errors.
+    </action>
+    <action dev="AN" type="fix" fixes-bug="COCOON-1691" due-to="Feliciano Borrego" due-to-email="felibv@gmail.com">
+      XSP block: Renaming AttributeImpl xspAttr to _xspAttr was not applied to ESQL logicsheet.
+      That caused compilation errors in all XSPs using it.
+    </action>
     <action dev="JH" type="fix" fixes-bug="35162" due-to="Jochen Kuhnle" due-to-email="werbung@kuhnle.net">
       EclipseJavaCompiler chokes on warnings. Changed to errors.
     </action>

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java?rev=360082&r1=360081&r2=360082&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java Fri Dec
30 05:30:37 2005
@@ -33,6 +33,8 @@
 import org.apache.cocoon.Constants;
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.components.flow.util.PipelineUtil;
+import org.apache.cocoon.core.Core;
+import org.apache.cocoon.core.Settings;
 import org.apache.cocoon.environment.Context;
 import org.apache.cocoon.environment.Redirector;
 import org.apache.excalibur.source.SourceUtil;
@@ -72,6 +74,9 @@
     protected ServiceManager manager;
     protected ContinuationsManager continuationsMgr;
 
+    /** The settings of Cocoon. */
+    protected Settings settings;
+
     /**
      * Whether reloading of scripts should be done. Specified through
      * the "reload-scripts" attribute in <code>flow.xmap</code>.
@@ -102,26 +107,35 @@
         return this.instanceID;
     }
 
+    /**
+     * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
+     */
     public void configure(Configuration config) throws ConfigurationException {
-        reloadScripts = config.getChild("reload-scripts").getValueAsBoolean(false);
-        checkTime = config.getChild("check-time").getValueAsLong(1000L);
+        this.reloadScripts = config.getChild("reload-scripts").getValueAsBoolean(this.settings.isReloadingEnabled("flow"));
+        this.checkTime = config.getChild("check-time").getValueAsLong(this.settings.getReloadDelay("flow"));
     }
 
     /**
-     * Serviceable
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager sm) throws ServiceException {
         this.manager = sm;
         this.continuationsMgr = (ContinuationsManager)sm.lookup(ContinuationsManager.ROLE);
+        final Core core = (Core)this.manager.lookup(Core.ROLE);
+        this.settings = core.getSettings();
+        this.manager.release(core);
     }
 
+    /**
+     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
+     */
     public void contextualize(org.apache.avalon.framework.context.Context context)
     throws ContextException{
         this.avalonContext = context;
         this.context = (Context)context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {
@@ -129,6 +143,7 @@
             this.manager.release( this.continuationsMgr );
             this.continuationsMgr = null;
             this.manager = null;
+            this.settings = null;
         }
     }
 
@@ -174,7 +189,7 @@
      * @param out An OutputStream where the output should be written to.
      * @exception Exception If an error occurs.
      */
-    public void process(String uri, Object biz, OutputStream out)
+    protected void process(String uri, Object biz, OutputStream out)
     throws Exception {
         // FIXME (SW): should we deprecate this method in favor of PipelineUtil?
         PipelineUtil pipeUtil = new PipelineUtil();
@@ -187,6 +202,9 @@
         }
     }
 
+    /**
+     * @see org.apache.cocoon.components.flow.Interpreter#forwardTo(java.lang.String, java.lang.Object,
org.apache.cocoon.components.flow.WebContinuation, org.apache.cocoon.environment.Redirector)
+     */
     public void forwardTo(String uri, Object bizData,
                           WebContinuation continuation,
                           Redirector redirector)

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=360082&r1=360081&r2=360082&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/properties/core.properties (original)
+++ cocoon/trunk/src/webapp/WEB-INF/properties/core.properties Fri Dec 30 05:30:37 2005
@@ -34,6 +34,7 @@
 #org.apache.cocoon.reloading.sitemap=yes
 #org.apache.cocoon.reload-delay.sitemap=5000
 #org.apache.cocoon.reloading.config=yes
+#org.apache.cocoon.reloading.flow=yes
 
 # This parameter switches the logging system from LogKit to Log4J (or
 # any other logging implementation) for Cocoon.

Modified: cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf?rev=360082&r1=360081&r2=360082&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf Fri Dec 30 05:30:37 2005
@@ -76,10 +76,13 @@
       |       whether to check if the scripts source files are modified.
       |       Checking for modification is an expensive operation, so leave
       |       it disabled in a production environment. If not present it is
-      |       assumed to be "false". When "true" *all* script files are
+      |       assumed to be "false" (if no property is overriding this). When
+      |       "true" *all* script files are
       |       checked for modification on each function invocation done using
       |       <map:call function="...">, but not more frequent than the value
       |       of "check-time" (see below).
+      |       The default for this function is determined by the value of the
+      |       reloading property 'org.apache.cocoon.reloading.flow'.
       |
       |    check-time (long value, default 1000):
       |       time in miliseconds between the checks for the last modification
@@ -93,8 +96,10 @@
     <!-- FOM (Flow Object Model) -->
     <component-instance exported="false" name="javascript" class="org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptInterpreter">
       <load-on-startup>resource://org/apache/cocoon/components/flow/javascript/fom/fom_system.js</load-on-startup>
-      <reload-scripts>true</reload-scripts>
-      <check-time>4000</check-time>
+      <!--
+        <reload-scripts>true</reload-scripts>
+        <check-time>4000</check-time>
+        -->
       <!--  <debugger>enabled</debugger> -->  <!-- JavaScript Debugger
support -->
     </component-instance>
   </flow-interpreters>

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=360082&r1=360081&r2=360082&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Fri Dec 30 05:30:37 2005
@@ -175,22 +175,16 @@
   <!-- These are the changes from the last 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="CZ" type="add">
+      Add hierarchical property configuration for reloading. The various components checking
+      for changes in files like sitemaps, xconfs or flow scripts can now be turned on or
off
+      by a single property.
+    </action>
     <action dev="GP" type="add">
       Added JMX support to the core ECM++ 
     </action>
-    <action dev="AN" type="fix">
-      XSP block: Reintroduce locally scoped xspAttr in xsp.xsl to improve backwards compatibility
for pre-2.1.9
-      logicsheets.  (Suggestion by Vadim Gritsenko).
-    </action>
     <action dev="JH" type="fix" fixes-bug="COCOON-1700">
       I18n: XMLResourceBundle checks now for both the new and the old namespace.
-    </action>
-    <action dev="AN" type="add">
-      XSP block: Instrument {#expr} interpolation to produce Cocoon stacktrace for parse
errors.
-    </action>
-    <action dev="AN" type="fix" fixes-bug="COCOON-1691" due-to="Feliciano Borrego" due-to-email="felibv@gmail.com">
-      XSP block: Renaming AttributeImpl xspAttr to _xspAttr was not applied to ESQL logicsheet.
-      That caused compilation errors in all XSPs using it.
     </action>
     <action dev="CZ" type="update">
       AbstractSAXTransformer supports removal of own namespace prefixes.



Mime
View raw message