dims 01/07/13 13:47:50
Modified: src/org/apache/cocoon/caching CacheValidity.java
CachedEventObject.java CachedStreamObject.java
ComponentCacheKey.java
src/org/apache/cocoon/components/store FilesystemStore.java
webapp cocoon.xconf
xdocs index.xml
Log:
"Friday the 13th" Patches from "Gerhard Froehlich" <[EMAIL PROTECTED]> for
filesystem store problems.
Revision Changes Path
1.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/caching/CacheValidity.java
Index: CacheValidity.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CacheValidity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CacheValidity.java 2001/05/09 20:50:02 1.1
+++ CacheValidity.java 2001/07/13 20:47:38 1.2
@@ -14,9 +14,9 @@
* xml file in this container.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:02 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/13 20:47:38 $
*/
-public interface CacheValidity {
+public interface CacheValidity extends java.io.Serializable {
/**
* Check if the component is still valid.
1.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/caching/CachedEventObject.java
Index: CachedEventObject.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CachedEventObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CachedEventObject.java 2001/05/09 20:50:02 1.1
+++ CachedEventObject.java 2001/07/13 20:47:39 1.2
@@ -13,9 +13,9 @@
* This is an cached object as it is stored in the <code>EventCache</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:02 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/13 20:47:39 $
*/
-public final class CachedEventObject {
+public final class CachedEventObject implements java.io.Serializable {
private Map validityObjects;
private Object saxFragment;
1.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/caching/CachedStreamObject.java
Index: CachedStreamObject.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/CachedStreamObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CachedStreamObject.java 2001/05/09 20:50:02 1.1
+++ CachedStreamObject.java 2001/07/13 20:47:39 1.2
@@ -13,9 +13,9 @@
* This is an cached object as it is stored in the <code>StreamCache</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:02 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/13 20:47:39 $
*/
-public final class CachedStreamObject {
+public final class CachedStreamObject implements java.io.Serializable {
private Map validityObjects;
private byte[] response;
1.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/caching/ComponentCacheKey.java
Index: ComponentCacheKey.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/ComponentCacheKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentCacheKey.java 2001/05/09 20:50:03 1.1
+++ ComponentCacheKey.java 2001/07/13 20:47:40 1.2
@@ -16,9 +16,9 @@
* is unique inside the component space.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:03 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/13 20:47:40 $
*/
-public final class ComponentCacheKey {
+public final class ComponentCacheKey implements java.io.Serializable {
public static final int ComponentType_Generator = 1;
public static final int ComponentType_Transformer = 2;
1.3 +0 -1
xml-cocoon2/src/org/apache/cocoon/components/store/FilesystemStore.java
Index: FilesystemStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/FilesystemStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilesystemStore.java 2001/07/13 11:13:15 1.2
+++ FilesystemStore.java 2001/07/13 20:47:43 1.3
@@ -9,7 +9,6 @@
import java.io.File;
import java.io.IOException;
-import java.net.URLEncoder;
import java.util.Enumeration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
1.18 +31 -24 xml-cocoon2/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cocoon.xconf 2001/07/11 18:08:44 1.17
+++ cocoon.xconf 2001/07/13 20:47:46 1.18
@@ -23,25 +23,27 @@
JVM for normal operation.
heapsize: Indicates how big the heap size can grow to before the
cleanup thread kicks in.
- objectlifetime: Indicates how long (seconds) a cache object will
- be hold in memory. The object will be thrown out,
- when the time is over.
- interval: Indicates the interval of the cleanup thread in seconds.
+ cleanupthreadinterval: Indicates the interval of the cleanup thread in
seconds.
maxobjects: Indicates how many objects will be hold in the cache.
When the number of maxobjects has been reached. The
last object in the cache will be thrown out.
- usethread: Indicates whether we use a cleanup thread or not.
+ usecleanupthread: Indicates whether we use a cleanup thread or not.
threadpriority: Indicates the priority of the cleanup thread.
(1 is the lowest priority and 10 is the highest).
+ filesystem: Turns the filesystem storage for objects on or off.
+ writerthreadinterval: Inidicates the interval of the writer thread in millis.
+ This background threads writes objects onto the
+ filesystem.
-->
<store class="org.apache.cocoon.components.store.MRUMemoryStore">
<parameter name="freememory" value="1000000"/>
<parameter name="heapsize" value="60000000"/>
- <parameter name="objectlifetime" value="300"/>
- <parameter name="interval" value="10"/>
+ <parameter name="cleanupthreadinterval" value="10"/>
<parameter name="maxobjects" value="100"/>
- <parameter name="usethread" value="false"/>
+ <parameter name="usecleanupthread" value="true"/>
<parameter name="threadpriority" value="5"/>
+ <parameter name="filesystem" value="false"/>
+ <parameter name="writerthreadinterval" value="100"/>
</store>
<!-- The url factory adds special url protocols to the system, they
@@ -195,25 +197,27 @@
JVM for normal operation.
heapsize: Indicates how big the heap size can grow to before the
cleanup thread kicks in.
- objectlifetime: Indicates how long (seconds) a cache object will
- be hold in memory. The object will be thrown out,
- when the time is over.
- interval: Indicates the interval of the cleanup thread in seconds.
+ cleanupthreadinterval: Indicates the interval of the cleanup thread in
seconds.
maxobjects: Indicates how many objects will be hold in the cache.
When the number of maxobjects has been reached. The
last object in the cache will be thrown out.
- usethread: Indicates whether we use a cleanup thread or not.
+ usecleanupthread: Indicates whether we use a cleanup thread or not.
threadpriority: Indicates the priority of the cleanup thread.
(1 is the lowest priority and 10 is the highest).
+ filesystem: Turns the filesystem storage for objects on or off.
+ writerthreadinterval: Inidicates the interval of the writer thread in millis.
+ This background threads writes objects onto the
+ filesystem.
-->
<stream-cache class="org.apache.cocoon.components.store.MRUMemoryStore">
<parameter name="freememory" value="1000000"/>
<parameter name="heapsize" value="60000000"/>
- <parameter name="objectlifetime" value="300"/>
- <parameter name="interval" value="10"/>
+ <parameter name="cleanupthreadinterval" value="10"/>
<parameter name="maxobjects" value="100"/>
- <parameter name="usethread" value="false"/>
+ <parameter name="usecleanupthread" value="true"/>
<parameter name="threadpriority" value="5"/>
+ <parameter name="filesystem" value="false"/>
+ <parameter name="writerthreadinterval" value="500"/>
</stream-cache>
<!-- An EventPipeline connects the generator and the various transformers
@@ -231,26 +235,29 @@
JVM for normal operation.
heapsize: Indicates how big the heap size can grow to before the
cleanup thread kicks in.
- objectlifetime: Indicates how long (seconds) a cache object will
- be hold in memory. The object will be thrown out,
- when the time is over.
- interval: Indicates the interval of the cleanup thread in seconds.
+ cleanupthreadinterval: Indicates the interval of the cleanup thread in
seconds.
maxobjects: Indicates how many objects will be hold in the cache.
When the number of maxobjects has been reached. The
last object in the cache will be thrown out.
- usethread: Indicates whether we use a cleanup thread or not.
+ usecleanupthread: Indicates whether we use a cleanup thread or not.
threadpriority: Indicates the priority of the cleanup thread.
(1 is the lowest priority and 10 is the highest).
+ filesystem: Turns the filesystem storage for objects on or off.
+ writerthreadinterval: Inidicates the interval of the writer thread in millis.
+ This background threads writes objects onto the
+ filesystem.
-->
<event-cache class="org.apache.cocoon.components.store.MRUMemoryStore">
<parameter name="freememory" value="1000000"/>
<parameter name="heapsize" value="60000000"/>
- <parameter name="objectlifetime" value="300"/>
- <parameter name="interval" value="10"/>
+ <parameter name="cleanupthreadinterval" value="10"/>
<parameter name="maxobjects" value="100"/>
- <parameter name="usethread" value="false"/>
+ <parameter name="usecleanupthread" value="true"/>
<parameter name="threadpriority" value="5"/>
+ <parameter name="filesystem" value="false"/>
+ <parameter name="writerthreadinterval" value="500"/>
</event-cache>
+
<!-- The SAXConnector connects the various pipeline components.
LoggingSAXConnector logs SAX events between pipeline components
1.4 +1 -1 xml-cocoon2/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 2001/07/13 09:56:36 1.3
+++ index.xml 2001/07/13 20:47:48 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!DOCTYPE document SYSTEM "./dtd/document-v10.dtd">
+<!DOCTYPE document SYSTEM "document-v10.dtd">
<document>
<header>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
