You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/12/29 14:38:00 UTC
svn commit: r491004 - in /cocoon/trunk/core:
cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/
cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/
cocoon-core/src/main/java/org/apache/cocoon/generation/ cocoon-core/src/...
Author: danielf
Date: Fri Dec 29 05:37:59 2006
New Revision: 491004
URL: http://svn.apache.org/viewvc?view=rev&rev=491004
Log:
Moving virtual sitemap components stuff from cocoon-core to whiteboard, part II.
Removed:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/VirtualPipelineGenerator.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/impl/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/VirtualPipelineTransformer.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/generation/VirtualPipelineGeneratorTestCase.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/reading/
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/serialization/
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/transformation/VirtualPipelineTransformerTestCase.java
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/generation/VirtualPipelineGeneratorTestCase.xconf
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/generation/sub/
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/generation/vpc-param-expected.xml
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/generation/vpc-param.xml
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/generation/vpc-sitemap.xmap
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/generation/vpc-source-param-expected.xml
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/generation/vpc-source-param.xml
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/generation/vpc-test.xml
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/reading/
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/serialization/
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/VirtualPipelineTransformerTestCase.xconf
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/vpc-include.xsl
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/vpc-sitemap.xmap
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/vpc-test.xml
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/vpc-test2.xml
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/vpc-transform.xsl
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/vpc-v2-expected.xml
Modified:
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf
cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml
cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf?view=diff&rev=491004&r1=491003&r2=491004
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf Fri Dec 29 05:37:59 2006
@@ -68,15 +68,6 @@
<map:generator name="exception" src="org.apache.cocoon.generation.ExceptionGenerator"/>
<map:generator label="content" logger="sitemap.generator.mp3directory" name="mp3directory" src="org.apache.cocoon.generation.MP3DirectoryGenerator"/>
- <!--
- - Virtual Pipeline Generator: Composed of other pipeline components.
- -->
- <map:generator name="virtual" src="org.apache.cocoon.generation.VirtualPipelineGenerator">
- <map:generate src="welcome.xml"/>
- <map:transform src="welcome.xslt">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- </map:generator>
</map:generators>
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml?view=diff&rev=491004&r1=491003&r2=491004
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/components/treeprocessor/sitemap-language.xml Fri Dec 29 05:37:59 2006
@@ -52,30 +52,6 @@
<node name="components" builder="org.apache.cocoon.components.treeprocessor.sitemap.ComponentsNodeBuilder"/>
- <node name="generators" builder="org.apache.cocoon.components.treeprocessor.sitemap.VPCsNodeBuilder"/>
-
- <node name="generator" builder="org.apache.cocoon.components.treeprocessor.sitemap.VPCNodeBuilder">
- <ignored-children>source</ignored-children>
- </node>
-
- <node name="transformers" builder="org.apache.cocoon.components.treeprocessor.sitemap.VPCsNodeBuilder"/>
-
- <node name="transformer" builder="org.apache.cocoon.components.treeprocessor.sitemap.VPCNodeBuilder">
- <ignored-children>source</ignored-children>
- </node>
-
- <node name="serializers" builder="org.apache.cocoon.components.treeprocessor.sitemap.VPCsNodeBuilder"/>
-
- <node name="serializer" builder="org.apache.cocoon.components.treeprocessor.sitemap.VPCNodeBuilder">
- <ignored-children>source</ignored-children>
- </node>
-
- <node name="readers" builder="org.apache.cocoon.components.treeprocessor.sitemap.VPCsNodeBuilder"/>
-
- <node name="reader" builder="org.apache.cocoon.components.treeprocessor.sitemap.VPCNodeBuilder">
- <ignored-children>source</ignored-children>
- </node>
-
<node name="views" builder="org.apache.cocoon.components.treeprocessor.CategoryNodeBuilder">
<allowed-children>view</allowed-children>
</node>
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap?view=diff&rev=491004&r1=491003&r2=491004
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/sitemap.xmap Fri Dec 29 05:37:59 2006
@@ -156,12 +156,6 @@
<map:serialize type="xhtml"/>
</map:match>
- <!-- FIXME Remove later -->
- <map:match pattern="v">
- <map:generate type="virtual"/>
- <map:serialize type="xhtml"/>
- </map:match>
-
<!--+
| The default matching is also capable of matching more than a
| single request by the use of 'wildcards'. There are two kinds of