Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 9500 invoked by uid 500); 15 Feb 2002 11:34:12 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 9491 invoked by uid 500); 15 Feb 2002 11:34:11 -0000 Delivered-To: apmail-xml-cocoon2-cvs@apache.org Date: 15 Feb 2002 11:34:11 -0000 Message-ID: <20020215113411.19485.qmail@icarus.apache.org> From: cziegeler@apache.org To: xml-cocoon2-cvs@apache.org Subject: cvs commit: xml-cocoon2/src/java/org/apache/cocoon/transformation XTTransformer.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N cziegeler 02/02/15 03:34:11 Modified: 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/store MRUMemoryStore.java Store.java src/java/org/apache/cocoon/components/xslt XSLTProcessorImpl.java src/java/org/apache/cocoon/transformation XTTransformer.java Log: Added some constants for the store Revision Changes Path 1.14 +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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- AbstractMarkupLanguage.java 15 Feb 2002 02:12:30 -0000 1.13 +++ AbstractMarkupLanguage.java 15 Feb 2002 11:34:11 -0000 1.14 @@ -102,7 +102,7 @@ * @author Ricardo Rocha * @author Davanum Srinivas * @author Ovidiu Predescu - * @version CVS $Id: AbstractMarkupLanguage.java,v 1.13 2002/02/15 02:12:30 vgritsenko Exp $ + * @version CVS $Id: AbstractMarkupLanguage.java,v 1.14 2002/02/15 11:34:11 cziegeler Exp $ */ public abstract class AbstractMarkupLanguage extends AbstractLoggable @@ -236,7 +236,7 @@ this.manager = manager; // Initialize logicsheet cache - this.logicsheetCache = (Store) manager.lookup(Store.ROLE + "/TransientCache"); + this.logicsheetCache = (Store) manager.lookup(Store.TRANSIENT_CACHE); // Initialize the URL factory source resolver this.urlFactory = (URLFactory)this.manager.lookup(URLFactory.ROLE); 1.7 +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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CachingEventPipeline.java 15 Feb 2002 02:12:30 -0000 1.6 +++ CachingEventPipeline.java 15 Feb 2002 11:34:11 -0000 1.7 @@ -88,7 +88,7 @@ * does not cache! (If it would cache, the response would be cached twice!) * * @author Carsten Ziegeler - * @version CVS $Id: CachingEventPipeline.java,v 1.6 2002/02/15 02:12:30 vgritsenko Exp $ + * @version CVS $Id: CachingEventPipeline.java,v 1.7 2002/02/15 11:34:11 cziegeler 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 + "/TransientCache"); + this.eventCache = (Store)this.manager.lookup(Store.TRANSIENT_CACHE); } /** 1.6 +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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CachingStreamPipeline.java 15 Feb 2002 02:12:30 -0000 1.5 +++ CachingStreamPipeline.java 15 Feb 2002 11:34:11 -0000 1.6 @@ -88,7 +88,7 @@ * * * @author Carsten Ziegeler - * @version CVS $Id: CachingStreamPipeline.java,v 1.5 2002/02/15 02:12:30 vgritsenko Exp $ + * @version CVS $Id: CachingStreamPipeline.java,v 1.6 2002/02/15 11:34:11 cziegeler 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 + "/TransientCache"); + this.streamCache = (Store)this.manager.lookup(Store.TRANSIENT_CACHE); } public void dispose() { 1.12 +3 -3 xml-cocoon2/src/java/org/apache/cocoon/components/store/MRUMemoryStore.java Index: MRUMemoryStore.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/MRUMemoryStore.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- MRUMemoryStore.java 13 Feb 2002 11:05:10 -0000 1.11 +++ MRUMemoryStore.java 15 Feb 2002 11:34:11 -0000 1.12 @@ -86,7 +86,7 @@ * @author Gerhard Froehlich * @author Davanum Srinivas * @author Vadim Gritsenko - * @version CVS $Id: MRUMemoryStore.java,v 1.11 2002/02/13 11:05:10 cziegeler Exp $ + * @version CVS $Id: MRUMemoryStore.java,v 1.12 2002/02/15 11:34:11 cziegeler Exp $ */ public final class MRUMemoryStore extends AbstractLoggable @@ -108,10 +108,10 @@ public void compose(ComponentManager manager) throws ComponentException { this.manager = manager; if (getLogger().isDebugEnabled()) { - getLogger().debug("Looking up " + Store.ROLE + "/PersistentCache"); + getLogger().debug("Looking up " + Store.PERSISTENT_CACHE); getLogger().debug("Looking up " + StoreJanitor.ROLE); } - this.persistentStore = (Store)manager.lookup(Store.ROLE + "/PersistentCache"); + this.persistentStore = (Store)manager.lookup(Store.PERSISTENT_CACHE); this.storeJanitor = (StoreJanitor)manager.lookup(StoreJanitor.ROLE); } 1.5 +5 -2 xml-cocoon2/src/java/org/apache/cocoon/components/store/Store.java Index: Store.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/Store.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Store.java 4 Feb 2002 12:31:09 -0000 1.4 +++ Store.java 15 Feb 2002 11:34:11 -0000 1.5 @@ -67,11 +67,14 @@ * (Apache Software Foundation) * @author Pierpaolo Fumagalli * (Apache Software Foundation, Exoffice Technologies) - * @version CVS $Id: Store.java,v 1.4 2002/02/04 12:31:09 cziegeler Exp $ + * @version CVS $Id: Store.java,v 1.5 2002/02/15 11:34:11 cziegeler Exp $ */ public interface Store extends Component { - String ROLE = "org.apache.cocoon.components.store.Store"; + String ROLE = "org.apache.cocoon.components.store.Store/Repository"; + + String TRANSIENT_CACHE = "org.apache.cocoon.components.store.Store/TransientCache"; + String PERSISTENT_CACHE = "org.apache.cocoon.components.store.Store/PersistentCache"; /** * Get the object associated to the given unique key. 1.15 +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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- XSLTProcessorImpl.java 15 Feb 2002 02:12:30 -0000 1.14 +++ XSLTProcessorImpl.java 15 Feb 2002 11:34:11 -0000 1.15 @@ -121,7 +121,7 @@ * (TransformerFactory.newInstance()). * * @author Ovidiu Predescu - * @version CVS $Id: XSLTProcessorImpl.java,v 1.14 2002/02/15 02:12:30 vgritsenko Exp $ + * @version CVS $Id: XSLTProcessorImpl.java,v 1.15 2002/02/15 11:34:11 cziegeler 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 + "/TransientCache"); + this.store = (Store)manager.lookup(Store.TRANSIENT_CACHE); } /** 1.8 +3 -3 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- XTTransformer.java 15 Feb 2002 02:12:30 -0000 1.7 +++ XTTransformer.java 15 Feb 2002 11:34:11 -0000 1.8 @@ -94,7 +94,7 @@ * This Transformer use the XT processor. * * @author Sahuc Sebastien - * @version CVS $Id: XTTransformer.java,v 1.7 2002/02/15 02:12:30 vgritsenko Exp $ + * @version CVS $Id: XTTransformer.java,v 1.8 2002/02/15 11:34:11 cziegeler Exp $ */ public class XTTransformer extends DocumentHandlerWrapper implements Transformer, Composable, Loggable, Disposable { @@ -126,10 +126,10 @@ this.manager = manager; try { - this.store = (Store) manager.lookup(Store.ROLE + "/TransientCache"); + this.store = (Store) manager.lookup(Store.TRANSIENT_CACHE); } catch (Exception e) { log.error("Could not find component for role " - + Store.ROLE + "/TransientCache", e); + + Store.TRANSIENT_CACHE, e); } } ---------------------------------------------------------------------- In case of troubles, e-mail: webmaster@xml.apache.org To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: cocoon-cvs-help@xml.apache.org