dims 01/04/18 08:14:34
Modified: src/org/apache/cocoon/caching Tag: xml-cocoon2
EventMemoryCache.java StreamMemoryCache.java
src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
webapp Tag: xml-cocoon2 cocoon.xconf
Added: src/org/apache/cocoon/components/store Tag: xml-cocoon2
MRUMemoryStore.java
Log:
- Switching Cache on by default.
- Ported C1 code from Gerhard Froehlich for MRUMemoryStore to C2.
- Moved Cache and Stream MemoryStore's to MRUMemoryStore
Revision Changes Path
No revision
No revision
1.1.2.3 +3 -3
xml-cocoon/src/org/apache/cocoon/caching/Attic/EventMemoryCache.java
Index: EventMemoryCache.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/caching/Attic/EventMemoryCache.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EventMemoryCache.java 2001/04/17 10:32:54 1.1.2.2
+++ EventMemoryCache.java 2001/04/18 15:14:15 1.1.2.3
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.caching;
-import org.apache.cocoon.components.store.MemoryStore;
+import org.apache.cocoon.components.store.MRUMemoryStore;
/**
* An implementation for the EventCache which simply stores the
* cached objects in the memory.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/17 10:32:54 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/18 15:14:15 $
*/
public final class EventMemoryCache
-extends MemoryStore
+extends MRUMemoryStore
implements EventCache {
}
1.1.2.2 +3 -3
xml-cocoon/src/org/apache/cocoon/caching/Attic/StreamMemoryCache.java
Index: StreamMemoryCache.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/caching/Attic/StreamMemoryCache.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- StreamMemoryCache.java 2001/04/17 10:33:02 1.1.2.1
+++ StreamMemoryCache.java 2001/04/18 15:14:17 1.1.2.2
@@ -7,17 +7,17 @@
*****************************************************************************/
package org.apache.cocoon.caching;
-import org.apache.cocoon.components.store.MemoryStore;
+import org.apache.cocoon.components.store.MRUMemoryStore;
/**
* An implementation for the StreamCache which simply stores the
* cached objects in the memory.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/17 10:33:02 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/18 15:14:17 $
*/
public final class StreamMemoryCache
-extends MemoryStore
+extends MRUMemoryStore
implements StreamCache {
}
No revision
No revision
1.1.2.33 +8 -6
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -r1.1.2.32 -r1.1.2.33
--- AbstractMarkupLanguage.java 2001/04/13 12:09:35 1.1.2.32
+++ AbstractMarkupLanguage.java 2001/04/18 15:14:22 1.1.2.33
@@ -35,6 +35,7 @@
import org.apache.avalon.Composer;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
+import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -43,7 +44,7 @@
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
-import org.apache.cocoon.components.store.MemoryStore;
+import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.util.IOUtils;
@@ -52,14 +53,14 @@
* logicsheets as the only means of code generation. Code generation should
be decoupled from this context!!!
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.32 $ $Date: 2001/04/13 12:09:35 $
+ * @version CVS $Revision: 1.1.2.33 $ $Date: 2001/04/18 15:14:22 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composer, Configurable {
/** The supported language table */
protected Hashtable languages;
/** The in-memory code-generation logicsheet cache */
- protected MemoryStore logicsheetCache;
+ protected Store logicsheetCache;
/** The markup language's namespace uri */
protected String uri;
@@ -74,16 +75,17 @@
* Set the global component manager.
* @param manager The sitemap-specified component manager
*/
- public void compose(ComponentManager manager) {
+ public void compose(ComponentManager manager) throws
ComponentManagerException {
this.manager = manager;
+
+ // Initialize logicsheet cache
+ this.logicsheetCache = (Store) manager.lookup(Roles.STORE);
}
/** The default constructor. */
public AbstractMarkupLanguage() throws SAXException, IOException {
// Initialize language table
this.languages = new Hashtable();
- // Initialize logicsheet cache
- this.logicsheetCache = new MemoryStore();
}
/**
No revision
No revision
1.1.2.1 +240 -0
xml-cocoon/src/org/apache/cocoon/components/store/Attic/MRUMemoryStore.java
No revision
No revision
1.1.2.39 +3 -3 xml-cocoon/webapp/Attic/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -u -r1.1.2.38 -r1.1.2.39
--- cocoon.xconf 2001/04/17 15:00:19 1.1.2.38
+++ cocoon.xconf 2001/04/18 15:14:30 1.1.2.39
@@ -3,7 +3,7 @@
<!-- ===================== General Components =========================== -->
- <store class="org.apache.cocoon.components.store.MemoryStore"/>
+ <store class="org.apache.cocoon.components.store.MRUMemoryStore"/>
<url-factory>
<protocol name="resource"
class="org.apache.cocoon.components.url.ResourceURLFactory"/>
@@ -101,9 +101,9 @@
<sax-connector
class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
- <stream-pipeline
class="org.apache.cocoon.components.pipeline.NonCachingStreamPipeline"/>
+ <stream-pipeline
class="org.apache.cocoon.components.pipeline.CachingStreamPipeline"/>
- <event-pipeline
class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
+ <event-pipeline
class="org.apache.cocoon.components.pipeline.CachingEventPipeline"/>
<!-- ======================== The sitemap ============================== -->
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
