sylvain 01/11/15 10:08:24
Modified: src/org/apache/cocoon cocoon.roles
Log:
Reverted changes to avoid errors, but this means caching is disabled again.
More work needed...
Revision Changes Path
1.29 +51 -103 xml-cocoon2/src/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cocoon.roles 2001/11/13 14:05:45 1.28
+++ cocoon.roles 2001/11/15 18:08:24 1.29
@@ -13,11 +13,6 @@
]>
<role-list>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- General purpose roles
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
<role name="org.apache.cocoon.components.parser.Parser"
shorthand="parser"
default-class="org.apache.cocoon.components.parser.JaxpParser"/>
@@ -30,21 +25,17 @@
shorthand="xpath-processor"
default-class="org.apache.cocoon.components.xpath.XPathProcessorImpl"/>
- <role name="org.apache.cocoon.components.classloader.ClassLoaderManager"
- shorthand="classloader"
-
default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
-
- <role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
- shorthand="datasources"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
- <hint shorthand="jdbc"
class="org.apache.avalon.excalibur.datasource.JdbcDataSource"/>
- <hint shorthand="j2ee"
class="org.apache.avalon.excalibur.datasource.J2eeDataSource"/>
- <hint shorthand="informix"
class="org.apache.avalon.excalibur.datasource.InformixDataSource"/>
- </role>
+ <role name="org.apache.cocoon.components.browser.Browser"
+ shorthand="browser"
+ default-class="org.apache.cocoon.components.browser.BrowserImpl"/>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Cache roles
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- For backwards compatibility, the shorthand for this role is "sitemap"
+ <role name="org.apache.cocoon.Processor"
+ shorthand="processor"/>
+-->
+ <role name="org.apache.cocoon.Processor"
+ shorthand="sitemap"
+ default-class="org.apache.cocoon.sitemap.SitemapManager"/>
<role name="org.apache.cocoon.components.store.Store"
shorthand="store"
@@ -54,34 +45,6 @@
shorthand="repository"
default-class="org.apache.cocoon.components.store.FilesystemStore"/>
- <role name="org.apache.cocoon.components.store.Store/EventCache"
- shorthand="event-cache"
- default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
-
- <role name="org.apache.cocoon.components.store.Store/StreamCache"
- shorthand="stream-cache"
- default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
-
- <role name="org.apache.cocoon.components.store.StoreJanitor"
- shorthand="store-janitor"
- default-class="org.apache.cocoon.components.store.StoreJanitorImpl"/>
-
- <role name="org.apache.cocoon.components.store.FilesystemQueue"
- shorthand="filesystem-queue"
- default-class="org.apache.cocoon.components.store.FilesystemQueueImpl"/>
-
- <role name="org.apache.cocoon.components.sax.XMLSerializer"
- shorthand="xml-serializer"
- default-class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"/>
-
- <role name="org.apache.cocoon.components.sax.XMLDeserializer"
- shorthand="xml-deserializer"
- default-class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"/>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Program generator roles
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
<role name="org.apache.cocoon.components.language.generator.ServerPagesSelector"
shorthand="server-pages"
default-class="org.apache.cocoon.components.language.generator.GeneratorSelector"/>
@@ -103,14 +66,29 @@
shorthand="program-generator"
default-class="org.apache.cocoon.components.language.generator.ProgramGeneratorImpl"/>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Source and URL related roles
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <role name="org.apache.cocoon.components.jsp.JSPEngine"
+ shorthand="jsp-engine"
+ default-class="org.apache.cocoon.components.jsp.JSPEngineImpl"/>
<role name="org.apache.cocoon.components.resolver.Resolver"
shorthand="resolver"
default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
+ <role name="org.apache.cocoon.components.classloader.ClassLoaderManager"
+ shorthand="classloader"
+
default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
+
+ <role name="org.apache.cocoon.components.image.ImageEncoderSelector"
+ shorthand="image-encoder"/>
+
+ <role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
+ shorthand="datasources"
+
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
+ <hint shorthand="jdbc"
class="org.apache.avalon.excalibur.datasource.JdbcDataSource"/>
+ <hint shorthand="j2ee"
class="org.apache.avalon.excalibur.datasource.J2eeDataSource"/>
+ <hint shorthand="informix"
class="org.apache.avalon.excalibur.datasource.InformixDataSource"/>
+ </role>
+
<role name="org.apache.cocoon.components.url.URLFactory"
shorthand="url-factory"
default-class="org.apache.cocoon.components.url.URLFactoryImpl"/>
@@ -119,22 +97,30 @@
shorthand="source-handler"
default-class="org.apache.cocoon.components.source.SourceHandlerImpl"/>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Misc. roles
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <role name="org.apache.cocoon.components.sax.XMLSerializer"
+ shorthand="xml-serializer"
+ default-class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"/>
- <role name="org.apache.cocoon.components.browser.Browser"
- shorthand="browser"
- default-class="org.apache.cocoon.components.browser.BrowserImpl"/>
+ <role name="org.apache.cocoon.components.sax.XMLDeserializer"
+ shorthand="xml-deserializer"
+ default-class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"/>
- <role name="org.apache.cocoon.components.jsp.JSPEngine"
- shorthand="jsp-engine"
- default-class="org.apache.cocoon.components.jsp.JSPEngineImpl"/>
+ <role name="org.apache.cocoon.components.store.Store/EventCache"
+ shorthand="event-cache"
+ default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
- <role name="org.apache.cocoon.components.xscript.XScriptManager"
- shorthand="xscript"
- default-class="org.apache.cocoon.components.xscript.XScriptManagerImpl"/>
+ <role name="org.apache.cocoon.components.store.Store/StreamCache"
+ shorthand="stream-cache"
+ default-class="org.apache.cocoon.components.store.MRUMemoryStore"/>
+
+ <role name="org.apache.cocoon.components.store.StoreJanitor"
+ shorthand="store-janitor"
+ default-class="org.apache.cocoon.components.store.StoreJanitorImpl"/>
+ <role name="org.apache.cocoon.components.store.FilesystemQueue"
+ shorthand="filesystem-queue"
+ default-class="org.apache.cocoon.components.store.FilesystemQueueImpl"/>
+
<role name="org.apache.cocoon.components.hsqldb.Server"
shorthand="hsqldb-server"
default-class="org.apache.cocoon.components.hsqldb.ServerImpl"/>
@@ -143,46 +129,8 @@
shorthand="profiler"
default-class="org.apache.cocoon.components.profiler.SimpleProfiler"/>
- <role name="org.apache.cocoon.components.image.ImageEncoderSelector"
- shorthand="image-encoder"/>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Pipeline-related roles
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<!-- For backwards compatibility, the shorthand for this role is "sitemap"
- <role name="org.apache.cocoon.Processor"
- shorthand="processor"/>
--->
- <role name="org.apache.cocoon.Processor"
- shorthand="sitemap"
- default-class="org.apache.cocoon.sitemap.SitemapManager"/>
-
- <role name="org.apache.cocoon.components.pipeline.StreamPipeline"
- shorthand="stream-pipeline"
-
default-class="org.apache.cocoon.components.pipeline.NonCachingStreamPipeline"/>
-
- <role name="org.apache.cocoon.components.pipeline.EventPipeline"
- shorthand="event-pipeline"
-
default-class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
-
- <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
- shorthand="sax-connector"/>
-
- <role name="org.apache.cocoon.generation.GeneratorSelector"
- shorthand="generator"
- default-class="org.apache.cocoon.sitemap.SitemapComponentSelector"/>
-
- <role name="org.apache.cocoon.transformation.TransformerSelector"
- shorthand="transformer"
- default-class="org.apache.cocoon.sitemap.SitemapComponentSelector"/>
-
- <role name="org.apache.cocoon.serialization.SerializerSelector"
- shorthand="serializer"
- default-class="org.apache.cocoon.sitemap.SitemapComponentSelector"/>
-
- <role name="org.apache.cocoon.reading.ReaderSelector"
- shorthand="reader"
- default-class="org.apache.cocoon.sitemap.SitemapComponentSelector"/>
+ <role name="org.apache.cocoon.components.xscript.XScriptManager"
+ shorthand="xscript"
+ default-class="org.apache.cocoon.components.xscript.XScriptManagerImpl"/>
</role-list>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
