Author: cziegeler
Date: Tue Oct 26 10:29:30 2004
New Revision: 55624
Removed:
cocoon/trunk/lib/core/excalibur-monitor-1.0.2.jar
Modified:
cocoon/trunk/lib/jars.xml
cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles
cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
Log:
Remove unused monitor package - don't know why it's here
Change some entries in jars.xml to Excalibur
Modified: cocoon/trunk/lib/jars.xml
==============================================================================
--- cocoon/trunk/lib/jars.xml (original)
+++ cocoon/trunk/lib/jars.xml Tue Oct 26 10:29:30 2004
@@ -36,14 +36,14 @@
</file>
<file>
- <title>Avalon Excalibur DataSource</title>
+ <title>Excalibur DataSource</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>optional/excalibur-datasource-1.1.1.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
@@ -58,7 +58,7 @@
</file>
<file>
- <title>Avalon Excalibur Event</title>
+ <title>Excalibur Event</title>
<description>
This is the Excalibur Event package which includes event queues,
asynchronous command processing, and the interfaces to support
@@ -66,10 +66,10 @@
</description>
<used-by>Cocoon Flow</used-by>
<lib>core/excalibur-event-api-1.1.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur Event</title>
+ <title>Excalibur Event</title>
<description>
This is the Excalibur Event package which includes event queues,
asynchronous command processing, and the interfaces to support
@@ -77,139 +77,128 @@
</description>
<used-by>Cocoon Flow</used-by>
<lib>core/excalibur-event-impl-1.1.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur I18n</title>
+ <title>Excalibur I18n</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-i18n-1.1.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/i18n/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur Instrument</title>
+ <title>Excalibur Instrument</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-instrument-1.0.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur Instrument Manager</title>
+ <title>Excalibur Instrument Manager</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-instrument-manager-1.0.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur Instrument Manager Interfaces</title>
+ <title>Excalibur Instrument Manager Interfaces</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-instrument-manager-interfaces-1.0.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur IO</title>
+ <title>Excalibur IO</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-io-1.1.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur Logger</title>
+ <title>Excalibur Logger</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-logger-1.1.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur Monitor</title>
+ <title>Excalibur Naming</title>
<description>
- Part of avalon, it is a set of classes and patterns that
- support high level server development.
- </description>
- <used-by>Cocoon</used-by>
- <lib>core/excalibur-monitor-1.0.2.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
- </file>
-
- <file>
- <title>Avalon Excalibur Naming</title>
- <description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-naming-1.0.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur Pool</title>
+ <title>Excalibur Pool</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-pool-1.2.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur SourceResolve</title>
+ <title>Excalibur SourceResolve</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-sourceresolve-1.1.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur Store</title>
+ <title>Excalibur Store</title>
<description>
Part of avalon, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-store-1.0.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
- <title>Avalon Excalibur XMLUtil</title>
+ <title>Excalibur XMLUtil</title>
<description>
- Part of avalon, it is a set of classes and patterns that
+ Part of Excalibur, it is a set of classes and patterns that
support high level server development.
</description>
<used-by>Cocoon</used-by>
<lib>core/excalibur-xmlutil-1.0.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
@@ -819,11 +808,11 @@
</file>
<file>
- <title>Avalon Excalibur Util</title>
+ <title>Excalibur Util</title>
<description>???</description>
<used-by>Axis block</used-by>
<lib>axis/lib/excalibur-util-1.0.jar</lib>
- <homepage>http://avalon.apache.org/excalibur/</homepage>
+ <homepage>http://excalibur.apache.org/</homepage>
</file>
<file>
Modified: cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles Tue Oct 26
10:29:30 2004
@@ -171,11 +171,6 @@
shorthand="xmlizer"
default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
- <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"/>
Modified: cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf Tue Oct 26 10:29:30 2004
@@ -538,13 +538,6 @@
<xml-deserializer
class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
logger="core.xml-deserializer" pool-grow="4" pool-max="32" pool-min="8"/>
<!--+
- | The Monitor keeps track on changes to a Resource.
- +-->
- <monitor logger="core.monitor">
- <thread frequency="10000" priority="5"/>
- </monitor>
-
- <!--+
| The Cache Manager is a component that can be used to cache content.
| It is currently used by the cinclude transformer
+-->
