cziegeler 2002/07/01 01:04:59
Modified: src/documentation/xdocs/installing Tag: cocoon_2_0_3_branch
updating.xml
src/java/org/apache/cocoon Tag: cocoon_2_0_3_branch
cocoon.roles
src/java/org/apache/cocoon/components/saxconnector Tag:
cocoon_2_0_3_branch LoggingSAXConnector.java
SAXConnector.java
Log:
Deprecating sax connectors
Revision Changes Path
No revision
No revision
1.4.2.3 +24 -3 xml-cocoon2/src/documentation/xdocs/installing/updating.xml
Index: updating.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/installing/updating.xml,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- updating.xml 15 Jun 2002 18:26:08 -0000 1.4.2.2
+++ updating.xml 1 Jul 2002 08:04:58 -0000 1.4.2.3
@@ -41,7 +41,24 @@
<p>Mention changes and update strategy...</p>
</s2>
<s2 title="XML Parser">
- <p>Mention changes and update strategy...</p>
+ <p>The XML parser has also been moved to Excalibur.
+ In the cocoon.xconf the hint name has therefore changed from <em>parser</em> to
+ <em>xml-parser</em>. The configuration has not changed, so if you want to
+ manually update swap the hint names.</p>
+ <p>From within your source code you should not lookup the
+ <em>org.apache.cocoon.components.parser.Parser.ROLE</em> anymore; use
+ <em>org.apache.avalon.excalibur.xml.Parser.ROLE</em> instead.
+ </p>
+ </s2>
+ <s2 title="XML Entity Resolver">
+ <p>The resolver used for resolving XML entities has also been moved to
Excalibur.
+ In the cocoon.xconf the hint name has therefore changed from <em>resolver</em>
to
+ <em>entity-resolver</em>. The configuration has not changed, so if you want to
+ manually update swap the hint names.</p>
+ <p>From within your source code you should not lookup the
+ <em>org.apache.cocoon.components.resolver.Resolver.ROLE</em> anymore; use
+ <em>org.apache.avalon.excalibur.xml.EntityResolver.ROLE</em> instead.
+ </p>
</s2>
<s2 title="Stores">
<p>The Store and StoreJanitor components and implementations have moved to
@@ -55,14 +72,16 @@
PERSISTENT_STORE and TRANSIENT_STORE. The hold() method has been removed
from the Store interface.</p>
</s2>
- <s2 title="Stream and Event Pipeline">
+ <s2 title="SAXConnectors, Stream and Event Pipeline">
<p>This is the only real incompatible change (But don't panic, this will
not affect you, well at least only a little bit :). The internal
architecture of Cocoon
has changed. In the older version, the processing pipeline - constructed by
a generator, the transformers and a serializer - was represented by two
components,
called stream and event pipeline.</p>
<p>For a simpler architecture, enhanced functionality and improved performance,
- these components have been combined into one: the processing pipeline.</p>
+ these components have been combined into one: the processing pipeline.
+ The very rarely used feature of SAXConnectors has been removed,
+ to avoid overcomponentization.</p>
<p>In addition the map:pipeline element of the sitemap has gained more meaning
as it is now possible to configure each map:pipeline section in the sitemap
differently. So there can be one section using caching, another one not
@@ -111,6 +130,8 @@
component. If you omit the type attribute the default configuration from the
components
section is used.
</p>
+ <p>The SAXConnectors have been removed, so if you manually upgrade you have to
remove
+ the <em>sax-connectors</em> configuration from the
<em>cocoon.xconf</em>.</p>
<p>So you see, although this is an incompatible change in the Java code, you
have only
little to do to update your Cocoon installation.</p>
</s3>
No revision
No revision
1.18.2.2 +14 -12 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.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- cocoon.roles 7 Jun 2002 09:34:23 -0000 1.18.2.1
+++ cocoon.roles 1 Jul 2002 08:04:58 -0000 1.18.2.2
@@ -130,16 +130,6 @@
shorthand="xscript"
default-class="org.apache.cocoon.components.xscript.XScriptManagerImpl"/>
- <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"/>
<!-- Lucene Components -->
<role name="org.apache.cocoon.components.search.LuceneCocoonIndexer"
@@ -202,14 +192,26 @@
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
<!-- DEPRECATED, use the xml-parser instead ! -->
-
<role name="org.apache.cocoon.components.resolver.Resolver"
shorthand="resolver"
default-class="org.apache.cocoon.components.resolver.ResolverImpl"/>
-
+ <!-- DEPRECATED, use the xml-parser instead ! -->
<role name="org.apache.cocoon.components.parser.Parser"
shorthand="parser"
default-class="org.apache.cocoon.components.parser.JaxpParser"/>
+ <!-- DEPRECATED, this will be replace with the ProcessingPipeline in the next
release ! -->
+ <role name="org.apache.cocoon.components.pipeline.StreamPipeline"
+ shorthand="stream-pipeline"
+
default-class="org.apache.cocoon.components.pipeline.NonCachingStreamPipeline"/>
+
+ <!-- DEPRECATED, this will be replace with the ProcessingPipeline in the next
release ! -->
+ <role name="org.apache.cocoon.components.pipeline.EventPipeline"
+ shorthand="event-pipeline"
+
default-class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
+
+ <!-- DEPRECATED, this will be removed in the next release ! -->
+ <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
+ shorthand="sax-connector"/>
</role-list>
No revision
No revision
1.4.2.1 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java
Index: LoggingSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- LoggingSAXConnector.java 22 Feb 2002 07:00:12 -0000 1.4
+++ LoggingSAXConnector.java 1 Jul 2002 08:04:59 -0000 1.4.2.1
@@ -70,6 +70,7 @@
/**
* This SAX connector logs all intermediate sax streams to the log.
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
+ * @deprecated This feature will be removed in the next release.
* @version CVS $Id$
*/
public class LoggingSAXConnector
1.4.2.1 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/components/saxconnector/SAXConnector.java
Index: SAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/saxconnector/SAXConnector.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- SAXConnector.java 22 Feb 2002 07:00:12 -0000 1.4
+++ SAXConnector.java 1 Jul 2002 08:04:59 -0000 1.4.2.1
@@ -57,6 +57,7 @@
/**
* Provides a connection between SAX components.
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Russell</a>
+ * @deprecated This feature will be removed in the next release.
* @version CVS $Id$
*/
public interface SAXConnector extends XMLPipe, Component, SitemapModelComponent {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
