unico 2004/01/31 08:54:49
Modified: src/java/org/apache/cocoon/components/sax
XMLByteStreamInterpreter.java
XMLByteStreamCompiler.java
src/java/org/apache/cocoon cocoon.roles
src/java/org/apache/cocoon/components/notification
DefaultNotifyingBuilder.java
src/java/org/apache/cocoon/caching/impl CacheImpl.java
src/java/org/apache/cocoon/components/pipeline/impl
BaseCachingProcessingPipeline.java
Log:
meta tags
Revision Changes Path
1.8 +4 -5
cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
Index: XMLByteStreamInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLByteStreamInterpreter.java 6 Dec 2003 21:22:10 -0000 1.7
+++ XMLByteStreamInterpreter.java 31 Jan 2004 16:54:49 -0000 1.8
@@ -65,11 +65,10 @@
* @version CVS $Id$
*
* @avalon.component
- * @avalon.service type="XMLDeserializer"
- * @x-avalon.lifestyle type="pooled"
- * @x-avalon.info name="xml-deserializer"
+ * @avalon.service type=XMLDeserializer
+ * @x-avalon.lifestyle type=pooled
+ * @x-avalon.info name=xml-deserializer
*/
-
public final class XMLByteStreamInterpreter
extends AbstractXMLProducer
implements XMLDeserializer, Recyclable {
1.7 +4 -5
cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
Index: XMLByteStreamCompiler.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLByteStreamCompiler.java 6 Dec 2003 21:22:10 -0000 1.6
+++ XMLByteStreamCompiler.java 31 Jan 2004 16:54:49 -0000 1.7
@@ -66,11 +66,10 @@
* @version CVS $Id$
*
* @avalon.component
- * @avalon.service type="XMLSerializer"
- * @x-avalon.lifestyle type="pooled"
- * @x-avalon.info name="xml-serializer"
+ * @avalon.service type=XMLSerializer
+ * @x-avalon.lifestyle type=pooled
+ * @x-avalon.info name=xml-serializer
*/
-
public final class XMLByteStreamCompiler
implements XMLSerializer, Recyclable {
1.17 +0 -32 cocoon-2.2/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cocoon.roles 7 Jan 2004 11:18:49 -0000 1.16
+++ cocoon.roles 31 Jan 2004 16:54:49 -0000 1.17
@@ -129,39 +129,15 @@
<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.ResourceLimitingJdbcDataSource"/>
- <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.avalon.excalibur.monitor.Monitor"
shorthand="monitor"
default-class="org.apache.avalon.excalibur.monitor.ActiveMonitor">
</role>
- <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"/>
-
<role name="org.apache.cocoon.components.xscript.XScriptManager"
shorthand="xscript"
default-class="org.apache.cocoon.components.xscript.XScriptManagerImpl"/>
- <role name="org.apache.cocoon.components.notification.NotifyingBuilder"
- shorthand="notifying-builder"
-
default-class="org.apache.cocoon.components.notification.DefaultNotifyingBuilder"/>
-
- <role name="org.apache.cocoon.caching.Cache"
- shorthand="cache"
- default-class="org.apache.cocoon.caching.impl.CacheImpl"/>
-
<role name="org.apache.cocoon.i18n.BundleFactory"
shorthand="i18n-bundles"
default-class="org.apache.cocoon.i18n.XMLResourceBundleFactory"/>
@@ -169,14 +145,6 @@
<role name="org.apache.cocoon.components.flow.ContinuationsManager"
shorthand="continuations-manager"
default-class="org.apache.cocoon.components.flow.ContinuationsManagerImpl" />
-
- <role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
- shorthand="input-modules"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
-
- <role
name="org.apache.cocoon.components.modules.output.OutputModuleSelector"
- shorthand="output-modules"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
<role name="org.apache.cocoon.components.persistence.RequestDataStore"
shorthand="request-data-store"
1.5 +2 -4
cocoon-2.2/src/java/org/apache/cocoon/components/notification/DefaultNotifyingBuilder.java
Index: DefaultNotifyingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/notification/DefaultNotifyingBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultNotifyingBuilder.java 26 Jan 2004 16:07:18 -0000 1.4
+++ DefaultNotifyingBuilder.java 31 Jan 2004 16:54:49 -0000 1.5
@@ -69,12 +69,10 @@
* @author Marc Liyanage (futureLAB AG)
* @version CVS $Id$
*
- * TODO: is no x-avalon.lifestyle correct/allowed here?
- *
* @avalon.component
* @avalon.service type=NotifyingBuilder
- * @x-avalon.info name=notifying-builder
* @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=notifying-builder
*/
public class DefaultNotifyingBuilder implements NotifyingBuilder {
1.11 +1 -2
cocoon-2.2/src/java/org/apache/cocoon/caching/impl/CacheImpl.java
Index: CacheImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/caching/impl/CacheImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CacheImpl.java 26 Dec 2003 18:43:39 -0000 1.10
+++ CacheImpl.java 31 Jan 2004 16:54:49 -0000 1.11
@@ -81,7 +81,6 @@
* @avalon.service type=Cache
* @x-avalon.lifestyle type=singleton
* @x-avalon.info name=cache
- *
*/
public class CacheImpl
extends AbstractLogEnabled
1.5 +1 -5
cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/BaseCachingProcessingPipeline.java
Index: BaseCachingProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/BaseCachingProcessingPipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseCachingProcessingPipeline.java 28 Jan 2004 17:23:22 -0000
1.4
+++ BaseCachingProcessingPipeline.java 31 Jan 2004 16:54:49 -0000
1.5
@@ -67,10 +67,6 @@
* @since 2.1
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Id$
- *
- * @avalon.component
- * @avalon.service type=ProcessingPipeline
- * @x-avalon.lifestyle type=pooled
*/
public abstract class BaseCachingProcessingPipeline
extends AbstractProcessingPipeline
