cziegeler 2003/01/14 02:36:52
Modified: . changes.xml
src/documentation sitemap.xmap
src/webapp sitemap.xmap
src/documentation/xdocs/installing updating.xml
src/webapp/samples/chaperon sitemap.xmap
src/blocks/profiler/conf profiler.component.xmap
src/documentation/xdocs/drafts sitemap-2.1-draft.xsd
src/java/org/apache/cocoon/components/treeprocessor/sitemap
ComponentsSelector.java
src/webapp/samples old_sitemap.xmap
src/java/org/apache/cocoon/components/treeprocessor
treeprocessor-builtins.xml
src/webapp/samples/profiler sitemap.xmap
Log:
Renaming components section for pipeline implementations to "pipes" and "pipe"
Revision Changes Path
1.337 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- changes.xml 14 Jan 2003 08:32:51 -0000 1.336
+++ changes.xml 14 Jan 2003 10:36:48 -0000 1.337
@@ -41,6 +41,9 @@
<release version="@version@" date="@date@">
<action dev="CZ" type="update">
+ Renaming components section for pipeline implementations to "pipes" and "pipe".
+ </action>
+ <action dev="CZ" type="update">
Updated to latest versions of excalibur sourceresolve and xmlutil.
</action>
<action dev="SMS" type="update" due-to="Michael Enke"
1.21 +4 -4 xml-cocoon2/src/documentation/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/sitemap.xmap,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sitemap.xmap 28 Dec 2002 07:08:47 -0000 1.20
+++ sitemap.xmap 14 Jan 2003 10:36:48 -0000 1.21
@@ -39,10 +39,10 @@
<map:matcher name="wildcard"
src="org.apache.cocoon.matching.WildcardURIMatcher"/>
</map:matchers>
- <map:pipelines default="caching">
- <map:pipeline name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"
+ <map:pipes default="caching">
+ <map:pipe name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"
logger="core.processing-pipeline" pool-max="32" pool-min="8"
pool-grow="4"/>
- </map:pipelines>
+ </map:pipes>
</map:components>
1.86 +6 -6 xml-cocoon2/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sitemap.xmap 3 Dec 2002 13:37:26 -0000 1.85
+++ sitemap.xmap 14 Jan 2003 10:36:48 -0000 1.86
@@ -351,13 +351,13 @@
manually indicate that certain pipeline-components should be considered as
cache points.
-->
- <map:pipelines default="caching">
- <map:pipeline name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
- <map:pipeline name="caching-point"
src="org.apache.cocoon.components.pipeline.impl.CachingPointProcessingPipeline">
+ <map:pipes default="caching">
+ <map:pipe name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
+ <map:pipe name="caching-point"
src="org.apache.cocoon.components.pipeline.impl.CachingPointProcessingPipeline">
<autoCachingPoint>On</autoCachingPoint>
- </map:pipeline>
- <map:pipeline name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
- </map:pipelines>
+ </map:pipe>
+ <map:pipe name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+ </map:pipes>
</map:components>
1.9 +5 -5 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- updating.xml 14 Jan 2003 10:04:24 -0000 1.8
+++ updating.xml 14 Jan 2003 10:36:48 -0000 1.9
@@ -91,7 +91,7 @@
<p>
The configuration of the pipelines has moved from the cocoon.xconf to the
sitemap.
So, for updating you have to remove the "event-pipeline" and
"stream-pipeline" section
- from your cocoon.xconf and add the map:pipelines section to the
map:components section
+ from your cocoon.xconf and add the map:pipes section to the map:components
section
in your sitemap. You can find the pipelines components definition in the
sample
sitemap of Cocoon. Here is an example:
</p>
@@ -99,12 +99,12 @@
<map:sitemap>
<map:components>
...
- <map:pipelines default="caching">
- <map:pipeline name="caching"
+ <map:pipes default="caching">
+ <map:pipe name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
- <map:pipeline name="noncaching"
+ <map:pipe name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
- </map:pipelines>
+ </map:pipes>
</map:components>
...
</map:sitemap>
1.3 +4 -4 xml-cocoon2/src/webapp/samples/chaperon/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/chaperon/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 15 Aug 2002 14:26:43 -0000 1.2
+++ sitemap.xmap 14 Jan 2003 10:36:49 -0000 1.3
@@ -65,10 +65,10 @@
<!-- ====================== Pipelines defintions ============================= -->
- <map:pipelines default="caching">
- <map:pipeline name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
- <map:pipeline name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
- </map:pipelines>
+ <map:pipes default="caching">
+ <map:pipe name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
+ <map:pipe name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+ </map:pipes>
</map:components>
1.2 +3 -3 xml-cocoon2/src/blocks/profiler/conf/profiler.component.xmap
Index: profiler.component.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/profiler/conf/profiler.component.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- profiler.component.xmap 26 Dec 2002 14:03:39 -0000 1.1
+++ profiler.component.xmap 14 Jan 2003 10:36:50 -0000 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<xmap xpath="/sitemap/components/pipelines"
unless="pipeline[@name='profile-caching']">
+<xmap xpath="/sitemap/components/pipes" unless="pipe[@name='profile-caching']">
<!-- The following two can be used for profiling:-->
- <map:pipeline name="profile-caching"
+ <map:pipe name="profile-caching"
src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
- <map:pipeline name="profile-noncaching"
+ <map:pipe name="profile-noncaching"
src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
</xmap>
1.5 +3 -3 xml-cocoon2/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd
Index: sitemap-2.1-draft.xsd
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap-2.1-draft.xsd 23 Jun 2002 21:23:49 -0000 1.4
+++ sitemap-2.1-draft.xsd 14 Jan 2003 10:36:50 -0000 1.5
@@ -125,7 +125,7 @@
<xs:complexContent>
<xs:extension base="map:componentListType">
<xs:sequence minOccurs="0">
- <xs:element name="pipeline" type="map:componentType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="pipe" type="map:componentType" minOccurs="0"
maxOccurs="unbounded"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -140,7 +140,7 @@
<xs:element name="selectors" type="map:selectorsType" minOccurs="0"/>
<xs:element name="matchers" type="map:matchersType" minOccurs="0"/>
<xs:element name="actions" type="map:actionsType" minOccurs="0"/>
- <xs:element name="pipelines" type="map:pipelinesConfigType"
minOccurs="0"/>
+ <xs:element name="pipes" type="map:pipelinesConfigType" minOccurs="0"/>
</xs:all>
</xs:complexType>
<!-- ====== Non component nor pipeline declarations: action-sets, views,
resources.
1.6 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java
Index: ComponentsSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentsSelector.java 29 Sep 2002 20:24:22 -0000 1.5
+++ ComponentsSelector.java 14 Jan 2003 10:36:51 -0000 1.6
@@ -111,7 +111,7 @@
"matcher",
"selector",
"action",
- "pipeline"
+ "pipe"
};
/** The role as an integer */
1.5 +6 -6 xml-cocoon2/src/webapp/samples/old_sitemap.xmap
Index: old_sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/old_sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- old_sitemap.xmap 31 Oct 2002 03:21:13 -0000 1.4
+++ old_sitemap.xmap 14 Jan 2003 10:36:51 -0000 1.5
@@ -314,14 +314,14 @@
<!--
The different pipeline implementations
-->
- <map:pipelines default="caching">
- <map:pipeline name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
- <map:pipeline name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+ <map:pipes default="caching">
+ <map:pipe name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
+ <map:pipe name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
<!-- The following two can be used for profiling:
- <map:pipeline name="profile-caching"
src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
- <map:pipeline name="profile-noncaching"
src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
+ <map:pipe name="profile-caching"
src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
+ <map:pipe name="profile-noncaching"
src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
-->
- </map:pipelines>
+ </map:pipes>
</map:components>
1.10 +1 -1
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml
Index: treeprocessor-builtins.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- treeprocessor-builtins.xml 8 Oct 2002 09:48:00 -0000 1.9
+++ treeprocessor-builtins.xml 14 Jan 2003 10:36:51 -0000 1.10
@@ -70,7 +70,7 @@
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
<role name="org.apache.cocoon.components.pipeline.ProcessingPipelineSelector"
- shorthand="pipelines"
+ shorthand="pipes"
default-class="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsSelector"/>
<role name="org.apache.cocoon.matching.MatcherSelector"
1.3 +2 -2 xml-cocoon2/src/webapp/samples/profiler/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/profiler/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 3 Sep 2002 10:07:31 -0000 1.2
+++ sitemap.xmap 14 Jan 2003 10:36:52 -0000 1.3
@@ -26,8 +26,8 @@
<map:actions>
</map:actions>
- <map:pipelines default="caching">
- </map:pipelines>
+ <map:pipes default="caching">
+ </map:pipes>
</map:components>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
