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/03/01 23:09:44 UTC
svn commit: r382173 - in
/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet:
core/META-INF/core-components.xconf test3/COB-INF/block-sitemap.xmap
test3/META-INF/block.xml
Author: danielf
Date: Wed Mar 1 14:09:42 2006
New Revision: 382173
URL: http://svn.apache.org/viewcvs?rev=382173&view=rev
Log:
Removed component configurations from sitemaps as that doesn't work with ECM++ anymore after the change to Spring.
Now all tests succeed.
Modified:
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/core/META-INF/core-components.xconf
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/COB-INF/block-sitemap.xmap
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/META-INF/block.xml
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/core/META-INF/core-components.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/core/META-INF/core-components.xconf?rev=382173&r1=382172&r2=382173&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/core/META-INF/core-components.xconf (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/core/META-INF/core-components.xconf Wed Mar 1 14:09:42 2006
@@ -51,6 +51,10 @@
<serializers default="xml">
<serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer" />
</serializers>
+
+ <readers default="resource">
+ <reader name="resource" src="org.apache.cocoon.reading.ResourceReader"/>
+ </readers>
<matchers default="wildcard">
<matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/COB-INF/block-sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/COB-INF/block-sitemap.xmap?rev=382173&r1=382172&r2=382173&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/COB-INF/block-sitemap.xmap (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/COB-INF/block-sitemap.xmap Wed Mar 1 14:09:42 2006
@@ -18,17 +18,6 @@
<!-- SVN $Id:$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
- <map:components>
- <input-modules>
- <component-instance name="block-property" class="org.apache.cocoon.components.modules.input.BlockPropertyModule"/>
- </input-modules>
-
- <map:readers default="resource">
- <map:reader name="resource" src="org.apache.cocoon.reading.ResourceReader"/>
- </map:readers>
- </map:components>
-
<map:pipelines>
<map:pipeline type="noncaching">
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/META-INF/block.xml?rev=382173&r1=382172&r2=382173&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/META-INF/block.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/META-INF/block.xml Wed Mar 1 14:09:42 2006
@@ -29,6 +29,11 @@
<servlet class="org.apache.cocoon.sitemap.SitemapServlet">
<sitemap file="COB-INF/block-sitemap.xmap"/>
</servlet>
+ <components>
+ <input-modules>
+ <component-instance name="block-property" class="org.apache.cocoon.components.modules.input.BlockPropertyModule"/>
+ </input-modules>
+ </components>
<properties>
<property name="bar">
<default>gazonk</default>