vgritsenko 02/02/14 18:12:30
Modified: src/java/org/apache/cocoon cocoon.roles
src/java/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java
src/java/org/apache/cocoon/components/pipeline
CachingEventPipeline.java
CachingStreamPipeline.java
src/java/org/apache/cocoon/components/xslt
XSLTProcessorImpl.java
src/java/org/apache/cocoon/transformation XTTransformer.java
src/webapp cocoon.xconf
Log:
Finish renaming of Store roles
Revision Changes Path
1.12 +5 -5 xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cocoon.roles 14 Feb 2002 15:47:53 -0000 1.11
+++ cocoon.roles 15 Feb 2002 02:12:30 -0000 1.12
@@ -44,13 +44,13 @@
shorthand="sitemap"
default-class="org.apache.cocoon.sitemap.SitemapManager"/>
- <role name="org.apache.cocoon.components.store.Store"
- shorthand="cache-transient"
- default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
-
- <role name="org.apache.cocoon.components.store.Store/Filesystem"
+ <role name="org.apache.cocoon.components.store.Store/Repository"
shorthand="repository"
default-class="org.apache.cocoon.components.store.FilesystemStore"/>
+
+ <role name="org.apache.cocoon.components.store.Store/TransientCache"
+ shorthand="cache-transient"
+ default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
<role name="org.apache.cocoon.components.store.Store/PersistentCache"
shorthand="cache-persistent"
1.13 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractMarkupLanguage.java 7 Feb 2002 04:07:27 -0000 1.12
+++ AbstractMarkupLanguage.java 15 Feb 2002 02:12:30 -0000 1.13
@@ -102,7 +102,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Id: AbstractMarkupLanguage.java,v 1.12 2002/02/07 04:07:27
vgritsenko Exp $
+ * @version CVS $Id: AbstractMarkupLanguage.java,v 1.13 2002/02/15 02:12:30
vgritsenko Exp $
*/
public abstract class AbstractMarkupLanguage
extends AbstractLoggable
@@ -236,7 +236,7 @@
this.manager = manager;
// Initialize logicsheet cache
- this.logicsheetCache = (Store) manager.lookup(Store.ROLE);
+ this.logicsheetCache = (Store) manager.lookup(Store.ROLE +
"/TransientCache");
// Initialize the URL factory source resolver
this.urlFactory = (URLFactory)this.manager.lookup(URLFactory.ROLE);
1.6 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachingEventPipeline.java 4 Feb 2002 12:25:11 -0000 1.5
+++ CachingEventPipeline.java 15 Feb 2002 02:12:30 -0000 1.6
@@ -88,7 +88,7 @@
* does not cache! (If it would cache, the response would be cached twice!)
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: CachingEventPipeline.java,v 1.5 2002/02/04 12:25:11 cziegeler
Exp $
+ * @version CVS $Id: CachingEventPipeline.java,v 1.6 2002/02/15 02:12:30 vgritsenko
Exp $
*/
public class CachingEventPipeline
extends AbstractEventPipeline
@@ -111,7 +111,7 @@
public void compose (ComponentManager manager)
throws ComponentException {
super.compose(manager);
- this.eventCache = (Store)this.manager.lookup(Store.ROLE);
+ this.eventCache = (Store)this.manager.lookup(Store.ROLE +
"/TransientCache");
}
/**
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/CachingStreamPipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CachingStreamPipeline.java 4 Feb 2002 12:25:11 -0000 1.4
+++ CachingStreamPipeline.java 15 Feb 2002 02:12:30 -0000 1.5
@@ -88,7 +88,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: CachingStreamPipeline.java,v 1.4 2002/02/04 12:25:11 cziegeler
Exp $
+ * @version CVS $Id: CachingStreamPipeline.java,v 1.5 2002/02/15 02:12:30
vgritsenko Exp $
*/
public class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -104,7 +104,7 @@
public void compose (ComponentManager manager)
throws ComponentException {
super.compose(manager);
- this.streamCache = (Store)this.manager.lookup(Store.ROLE);
+ this.streamCache = (Store)this.manager.lookup(Store.ROLE +
"/TransientCache");
}
public void dispose() {
1.14 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSLTProcessorImpl.java 13 Feb 2002 01:23:57 -0000 1.13
+++ XSLTProcessorImpl.java 15 Feb 2002 02:12:30 -0000 1.14
@@ -121,7 +121,7 @@
* (<code>TransformerFactory.newInstance()</code>).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Id: XSLTProcessorImpl.java,v 1.13 2002/02/13 01:23:57 vgritsenko
Exp $
+ * @version CVS $Id: XSLTProcessorImpl.java,v 1.14 2002/02/15 02:12:30 vgritsenko
Exp $
* @version 1.0
* @since July 11, 2001
*/
@@ -159,7 +159,7 @@
throws ComponentException {
this.manager = manager;
this.getLogger().debug("XSLTProcessorImpl component initialized.");
- this.store = (Store)manager.lookup(Store.ROLE);
+ this.store = (Store)manager.lookup(Store.ROLE + "/TransientCache");
}
/**
1.7 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/transformation/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/XTTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XTTransformer.java 7 Feb 2002 07:41:24 -0000 1.6
+++ XTTransformer.java 15 Feb 2002 02:12:30 -0000 1.7
@@ -94,7 +94,7 @@
* This Transformer use the XT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sahuc Sebastien</a>
- * @version CVS $Id: XTTransformer.java,v 1.6 2002/02/07 07:41:24 cziegeler Exp $
+ * @version CVS $Id: XTTransformer.java,v 1.7 2002/02/15 02:12:30 vgritsenko Exp $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composable, Loggable, Disposable {
@@ -126,10 +126,10 @@
this.manager = manager;
try {
- log.debug("Looking up " + Store.ROLE);
- this.store = (Store) manager.lookup(Store.ROLE);
+ this.store = (Store) manager.lookup(Store.ROLE + "/TransientCache");
} catch (Exception e) {
- log.error("Could not find component", e);
+ log.error("Could not find component for role "
+ + Store.ROLE + "/TransientCache", e);
}
}
1.28 +0 -9 xml-cocoon2/src/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/cocoon.xconf,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cocoon.xconf 14 Feb 2002 09:30:13 -0000 1.27
+++ cocoon.xconf 15 Feb 2002 02:12:30 -0000 1.28
@@ -68,15 +68,6 @@
</xml-parser>
<!-- ============================ STORE ============================ -->
- <!-- Store for the generated code. Used by compiled sitemap engine and
- XSP engine. Must be pointing to the work directory as generated
- classes are expected to be in this directory.
- -->
- <repository class="org.apache.cocoon.components.store.FilesystemStore"
- logger="core.store.repository">
- <parameter name="use-work-directory" value="true"/>
- </repository>
-
<!-- Persistent store for the cache. Two store implementations to choose
from:
* FilesystemStore: Simple. Dependable. Thorougly tested.
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
