vgritsenko 2002/08/12 15:31:56
Modified: . build.xml
src/java/org/apache/cocoon/components/hsqldb hsqldb.xconf
src/java/org/apache/cocoon/components/store jisp.xconf
src/webapp/WEB-INF cocoon.xconf
Log:
Set JispFilesystemStore store as default. To use old FilesystemStore, simply remove
jisp.jar.
This fixes bug #10697: Piles of ERROR log messages.
The reason is that there is maximum limit on absolute file path length (at least on
Windowze)
Revision Changes Path
1.254 +2 -1 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- build.xml 8 Aug 2002 02:06:29 -0000 1.253
+++ build.xml 12 Aug 2002 22:31:55 -0000 1.254
@@ -883,7 +883,8 @@
<exclude name="**/lucene.*" unless="lucene.present"/>
<exclude name="**/components/store/Jisp*.java" unless="jisp.present"/>
- <exclude name="**/jisp.*" unless="jisp.present"/>
+ <exclude name="**/store/jisp.*" unless="jisp.present"/>
+ <exclude name="**/store/file.*" if="jisp.present"/>
<exclude name="**/components/xmlform/**" unless="jxpath.present"/>
<exclude name="**/samples/xmlform/**" unless="jxpath.present"/>
1.4 +1 -1
xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/hsqldb.xconf
Index: hsqldb.xconf
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/hsqldb.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hsqldb.xconf 5 Jul 2002 09:20:40 -0000 1.3
+++ hsqldb.xconf 12 Aug 2002 22:31:55 -0000 1.4
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<xconf xpath="/cocoon" unless="hsqldb-server" insert-before="xml-parser">
-
<!-- HSQLDB Server for samples:
Comment this section out if you don't care about the samples.
port : number port where the server is listening
@@ -15,4 +14,5 @@
<parameter name="silent" value="true"/>
<parameter name="trace" value="false"/>
</hsqldb-server>
+
</xconf>
1.4 +11 -7
xml-cocoon2/src/java/org/apache/cocoon/components/store/jisp.xconf
Index: jisp.xconf
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/jisp.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jisp.xconf 6 May 2002 12:30:17 -0000 1.3
+++ jisp.xconf 12 Aug 2002 22:31:56 -0000 1.4
@@ -1,27 +1,31 @@
<?xml version="1.0"?>
-<xconf xpath="/cocoon"
- unless="comment()[contains(.,
'org.apache.cocoon.components.store.JispFilesystemStore')]">
+<xconf xpath="/cocoon" unless="persistent-store" insert-after="transient-store">
<!-- Persistent store for the cache. Two store implementations to choose
from:
* FilesystemStore: Simple. Dependable. Thorougly tested.
* JispFilesystemStore: Scalable. New kid on the block. Not thorougly
tested.
- If you opt in to use JispFilesystemStore, comment out FilesystemStore
- entry.
+
+ Common configuration parameters:
+ use-cache-directory: Indicates that cache directory specified in
+ web.xml should be used.
+ use-work-directory: Indicates that work directory specified in
+ web.xml should be used.
+ directory: Specifies directory to use. Absolute or relative to the
+ work directory.
JispFilesystemStore configuration parameters
(in addition to common parameters):
datafile: name of the store file to use.
indexfile: name of the index file to use.
order: FIXME: put description here.
-
+ -->
<persistent-store class="org.apache.cocoon.components.store.JispFilesystemStore"
logger="core.store.persistent">
<parameter name="use-cache-directory" value="true"/>
<parameter name="datafile" value="cocoon-cache.dat"/>
<parameter name="indexfile" value="cocoon-cache.idx"/>
- <parameter name="order" value="1701"/>
+ <parameter name="order" value="2701"/>
</persistent-store>
- -->
</xconf>
1.34 +0 -43 xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cocoon.xconf 5 Jul 2002 09:20:40 -0000 1.33
+++ cocoon.xconf 12 Aug 2002 22:31:56 -0000 1.34
@@ -67,24 +67,6 @@
<parameter name="document-builder-factory" value="???"/>
-->
</xml-parser>
-
- <!-- ============================ STORE ============================ -->
- <!-- Persistent store for the cache. Two store implementations to choose
- from:
- * FilesystemStore: Simple. Dependable. Thorougly tested.
- * JispFilesystemStore: Scalable. New kid on the block.
-
- Common configuration parameters:
- use-cache-directory: Indicates that cache directory specified in
- web.xml should be used.
- use-work-directory: Indicates that work directory specified in
- web.xml should be used.
- directory: Specifies directory to use. Absolute or relative to the
- work directory.
- -->
- <persistent-store logger="core.store.persistent">
- <parameter name="use-cache-directory" value="true"/>
- </persistent-store>
<!-- Memory Storing: -->
<transient-store logger="core.store.transient">
@@ -126,7 +108,6 @@
be removed when low on memory. Default 10% -->
<parameter name="percent_to_free" value="10"/>
</store-janitor>
- <!-- ============================ STORE END ========================= -->
<!-- XSLT Processor:
For Xalan: Turn 'incremental-processing' to true if you want a continous output
@@ -542,30 +523,6 @@
<parameter name="catalog" value="/WEB-INF/entities/catalog"/>
<parameter name="verbosity" value="1"/>
</entity-resolver>
-
-
- <!-- Persistent store for the cache. Two store implementations to choose
- from:
- * FilesystemStore: Simple. Dependable. Thorougly tested.
- * JispFilesystemStore: Scalable. New kid on the block. Not thorougly
tested.
- If you opt in to use JispFilesystemStore, comment out FilesystemStore
- entry.
-
- JispFilesystemStore configuration parameters
- (in addition to common parameters):
- datafile: name of the store file to use.
- indexfile: name of the index file to use.
- order: FIXME: put description here.
-
- <persistent-store class="org.apache.cocoon.components.store.JispFilesystemStore"
- logger="core.store.persistent">
- <parameter name="use-cache-directory" value="true"/>
- <parameter name="datafile" value="cocoon-cache.dat"/>
- <parameter name="indexfile" value="cocoon-cache.idx"/>
- <parameter name="order" value="1701"/>
- </persistent-store>
- -->
-
<!-- Deli support -->
<!-- Uncomment this section to enable DELI
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
