Return-Path: 
 <svn-return-7786-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 66418 invoked from network); 23 Aug 2008 05:58:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Aug 2008 05:58:37 -0000
Received: (qmail 87484 invoked by uid 500); 23 Aug 2008 05:58:35 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 87438 invoked by uid 500); 23 Aug 2008 05:58:35 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 87429 invoked by uid 99); 23 Aug 2008 05:58:35 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2008 22:58:35 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Aug 2008 05:57:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 42188238898A; Fri, 22 Aug 2008 22:58:16 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r688264 - in
 /forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF:
 cocoon.xconf properties/core.properties
Date: Sat, 23 Aug 2008 05:58:15 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080823055816.42188238898A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: crossley
Date: Fri Aug 22 22:58:15 2008
New Revision: 688264

URL: http://svn.apache.org/viewvc?rev=688264&view=rev
Log:
Synchronise the configurable properties with cocoon-2.1 xconf.
Issue: FOR-1091, FOR-955

Modified:
    forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf
    forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties

Modified: forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf?rev=688264&r1=688263&r2=688264&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf (original)
+++ forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf Fri Aug 22 22:58:15 2008
@@ -103,8 +103,8 @@
     <component-instance class="org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptInterpreter" exported="false" name="javascript">
       <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>${javascript.reload-scripts}</reload-scripts>
+      <check-time>${javascript.check-time}</check-time>
         -->
       <!--  <debugger>enabled</debugger> -->  <!-- JavaScript Debugger support -->
     </component-instance>
@@ -128,11 +128,10 @@
       | Enable this feature for web applications by setting
       | 'session-bound-continuations' to true.
       +-->
-  <continuations-manager logger="flow.manager" time-to-live="3600000"
-                         session-bound-continuations="false">
+  <continuations-manager continuation-sharing-bug-compatible="false" logger="flow.manager" session-bound-continuations="false" time-to-live="${continuations-manager.time-to-live}">
     <expirations-check type="periodic">
-      <offset>180000</offset>
-      <period>180000</period>
+      <offset>${continuations-manager.expirations-check.offset}</offset>
+      <period>${continuations-manager.expirations-check.period}</period>
     </expirations-check>
   </continuations-manager>
 
@@ -365,7 +364,7 @@
       |     from DTD. And the comment events from the internal DTD subset
       |     would appear in the serialized output again.
       +-->
-  <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser" logger="core.xml-parser" pool-grow="4" pool-max="32" pool-min="8">
+  <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser" logger="core.xml-parser" pool-max="${xml-parser.pool-max}">
     <parameter name="validate" value="false"/>
     <parameter name="namespace-prefixes" value="false"/>
     <parameter name="stop-on-warning" value="true"/>
@@ -463,7 +462,7 @@
       |    in the cache will be thrown out.
       +-->
   <transient-store logger="core.store.transient">
-    <parameter name="maxobjects" value="100"/>
+    <parameter name="maxobjects" value="${transient-store.maxobjects}"/>
   </transient-store>
 
   <!--+
@@ -478,7 +477,7 @@
       |    in the cache will be thrown out.
       +-->
   <store logger="core.store">
-    <parameter name="maxobjects" value="1000"/>
+    <parameter name="maxobjects" value="${store.maxobjects}"/>
     <parameter name="use-cache-directory" value="true"/>
   </store>
 
@@ -509,19 +508,19 @@
         | How much free memory shall be available in the jvm?
         | If not specified, defaults to 1Mb.
         +-->
-    <parameter name="freememory" value="1000000"/>
+    <parameter name="freememory" value="${store-janitor.freememory}"/>
     <!--+
         | How much memory at max jvm can consume?
         | The default max heapsize for Sun's JVM is (almost) 64Mb,
         | can be increased by specifying -Xmx command line parameter.
         | If not specified, defaults to 66600000 bytes.
         +-->
-    <parameter name="heapsize" value="67108864"/>
+    <parameter name="heapsize" value="${store-janitor.heapsize}"/>
     <!--+
         | How often shall the cleanup thread check memory?
         | If not specified, defaults to 10 seconds.
         +-->
-    <parameter name="cleanupthreadinterval" value="10"/>
+    <parameter name="cleanupthreadinterval" value="${store-janitor.cleanup-thread-interval}"/>
     <!--+
         | Experimental adaptive algorithm for cleanup interval
     <parameter name="adaptivethreadinterval" value="true"/>
@@ -530,7 +529,7 @@
         | What percent of the store elements shall be dropped on low memory?
         | If not specified, defaults to 10%
         +-->
-    <parameter name="percent_to_free" value="10"/>
+    <parameter name="percent_to_free" value="${store-janitor.percent-to-free}"/>
     <!--+
         | Shall garbage collector be invoked on low memory?
         | If not specified, defaults to false.
@@ -620,8 +619,8 @@
       | the intermediate results of the pipeline stages reducing the overhead
       | of xml parsing/serialization.
       +-->
-  <xml-serializer class="org.apache.cocoon.components.sax.XMLByteStreamCompiler" logger="core.xml-serializer" pool-grow="4" pool-max="32" pool-min="8"/>
-  <xml-deserializer class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter" logger="core.xml-deserializer" pool-grow="4" pool-max="32" pool-min="8"/>
+  <xml-serializer class="org.apache.cocoon.components.sax.XMLByteStreamCompiler" logger="core.xml.serializer" pool-max="${xml-serializer.pool-max}"/>
+  <xml-deserializer class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter" logger="core.xml.deserializer" pool-max="${xml-deserializer.pool-max}"/>
 
   <!--+
       | The Cache Manager is a component that can be used to cache content.

Modified: forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties?rev=688264&r1=688263&r2=688264&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties (original)
+++ forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties Fri Aug 22 22:58:15 2008
@@ -27,4 +27,19 @@
 #       FATAL_ERROR:  prints only log messages of this level
 org.apache.cocoon.logging.bootstrap.loglevel=WARN
 
+javascript.reload-scripts = true
+javascript.check-time = 4000
+continuations-manager.time-to-live = 3600000
+continuations-manager.expirations-check.offset = 180000
+continuations-manager.expirations-check.period = 180000
+xml-parser.pool-max = 32
+transient-store.maxobjects = 1000
+store.maxobjects = 1000
+store-janitor.freememory = 2048000
+store-janitor.heapsize = 66600000
+store-janitor.cleanup-thread-interval = 10
+store-janitor.percent-to-free = 10
+xml-serializer.pool-max = 32
+xml-deserializer.pool-max = 32
+
 org.apache.xml.resolver.verbosity=0