cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r374720 - in /cocoon/trunk/cocoon-blocks-fw: cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/ cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test1/META-INF/xconf/ cocoon-blocks-fw-impl/src/...
Date Fri, 03 Feb 2006 18:27:42 GMT
Author: danielf
Date: Fri Feb  3 10:27:24 2006
New Revision: 374720

URL: http://svn.apache.org/viewcvs?rev=374720&view=rev
Log:
Moved sitemap component configurations to core in test. Removed redundant component configurations
from sitemap and elsewhere in both test and samples.

Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/core-components.xconf
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test1/META-INF/xconf/test1.xconf
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test2/COB-INF/block-sitemap.xmap
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test3/COB-INF/block-sitemap.xmap
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/COB-INF/block-sitemap.xmap
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/META-INF/xconf/test1.xconf
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test2/COB-INF/block-sitemap.xmap
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test3/COB-INF/block-sitemap.xmap

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/core-components.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/core-components.xconf?rev=374720&r1=374719&r2=374720&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/core-components.xconf
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/core-components.xconf
Fri Feb  3 10:27:24 2006
@@ -39,5 +39,25 @@
     <component-instance class="org.apache.excalibur.source.impl.FileSourceFactory" name="file"/>
     <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
   </source-factories>
+  
+  <generators default="file">
+    <generator name="file" src="org.apache.cocoon.generation.FileGenerator"/>
+  </generators>
 
+  <transformers default="xslt">
+    <transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"/>
+  </transformers>
+
+  <serializers default="xml">
+    <serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"
/>
+  </serializers>
+
+  <matchers default="wildcard">
+    <matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
+  </matchers>
+
+  <pipes default="noncaching">
+    <pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+  </pipes>
+  
 </components>

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test1/META-INF/xconf/test1.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test1/META-INF/xconf/test1.xconf?rev=374720&r1=374719&r2=374720&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test1/META-INF/xconf/test1.xconf
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test1/META-INF/xconf/test1.xconf
Fri Feb  3 10:27:24 2006
@@ -17,7 +17,7 @@
 
 <!-- SVN $Id:test1.xconf 349759 2005-11-29 17:54:59 +0100 (Tue, 29 Nov 2005) danielf $
-->
 
-<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+<components>
   <source-factories>
     <component-instance name="block" class="org.apache.cocoon.components.source.impl.BlockSourceFactory"/>
   </source-factories>
@@ -25,24 +25,4 @@
   <input-modules>
     <component-instance name="block-path" class="org.apache.cocoon.components.modules.input.BlockPathModule"
/>
   </input-modules>
-
-  <map:generators default="file">
-    <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator"/>
-  </map:generators>
-
-  <map:transformers default="xslt">
-    <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"/>
-  </map:transformers>
-
-  <map:serializers default="xml">
-    <map:serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"
/>
-  </map:serializers>
-
-  <map:matchers default="wildcard">
-    <map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
-  </map:matchers>
-
-  <map:pipes default="noncaching">
-    <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
-  </map:pipes>
-</map:components>
+</components>

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test2/COB-INF/block-sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test2/COB-INF/block-sitemap.xmap?rev=374720&r1=374719&r2=374720&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test2/COB-INF/block-sitemap.xmap
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test2/COB-INF/block-sitemap.xmap
Fri Feb  3 10:27:24 2006
@@ -18,30 +18,6 @@
 <!-- SVN $Id:$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
-  <map:components>
-    <map:generators default="file">
-      <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator"/>
-    </map:generators>
-
-    <map:transformers default="xslt">
-      <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"/>
-    </map:transformers>
-
-    <map:serializers default="xml">
-      <map:serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
-    </map:serializers>
-
-    <map:matchers default="wildcard">
-      <map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
-    </map:matchers>
-
-    <map:pipes default="noncaching">
-      <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline">
-      </map:pipe>
-    </map:pipes>
-  </map:components>
-
   <map:pipelines>
     <map:pipeline>
 

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test3/COB-INF/block-sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test3/COB-INF/block-sitemap.xmap?rev=374720&r1=374719&r2=374720&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test3/COB-INF/block-sitemap.xmap
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/resources/org/apache/cocoon/blocks/test3/COB-INF/block-sitemap.xmap
Fri Feb  3 10:27:24 2006
@@ -24,10 +24,6 @@
       <component-instance name="block-property"  class="org.apache.cocoon.components.modules.input.BlockPropertyModule"/>
     </input-modules>
 
-    <map:serializers default="xml">
-      <map:serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
-    </map:serializers>
-
     <map:readers default="resource">
       <map:reader name="resource" src="org.apache.cocoon.reading.ResourceReader"/>
     </map:readers>

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/COB-INF/block-sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/COB-INF/block-sitemap.xmap?rev=374720&r1=374719&r2=374720&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/COB-INF/block-sitemap.xmap
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/COB-INF/block-sitemap.xmap
Fri Feb  3 10:27:24 2006
@@ -20,9 +20,9 @@
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
   <map:components>
-    <!--map:classpath>
-      <class-dir src="COB-INF/classes"/>
-    </map:classpath-->
+    <map:serializers default="xml">
+      <map:serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
+    </map:serializers>
   </map:components>
 
   <map:pipelines>
@@ -44,7 +44,7 @@
       </map:match>
 
       <map:match pattern="test4">
-        <map:generate src="resource://test.xml"/>
+        <map:generate src="resource://META-INF/classes/test.xml"/>
         <map:serialize/>
       </map:match>
 

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/META-INF/xconf/test1.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/META-INF/xconf/test1.xconf?rev=374720&r1=374719&r2=374720&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/META-INF/xconf/test1.xconf
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test1/META-INF/xconf/test1.xconf
Fri Feb  3 10:27:24 2006
@@ -17,7 +17,7 @@
 
 <!-- SVN $Id:test1.xconf 349759 2005-11-29 17:54:59 +0100 (Tue, 29 Nov 2005) danielf $
-->
 
-<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+<components>
   <source-factories>
     <component-instance name="block" class="org.apache.cocoon.components.source.impl.BlockSourceFactory"/>
   </source-factories>
@@ -25,24 +25,4 @@
   <input-modules>
     <component-instance name="block-path" class="org.apache.cocoon.components.modules.input.BlockPathModule"
/>
   </input-modules>
-
-  <map:generators default="file">
-    <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator"/>
-  </map:generators>
-
-  <map:transformers default="xslt">
-    <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"/>
-  </map:transformers>
-
-  <map:serializers default="xml">
-    <map:serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"
/>
-  </map:serializers>
-
-  <map:matchers default="wildcard">
-    <map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
-  </map:matchers>
-
-  <map:pipes default="noncaching">
-    <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
-  </map:pipes>
-</map:components>
+</components>

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test2/COB-INF/block-sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test2/COB-INF/block-sitemap.xmap?rev=374720&r1=374719&r2=374720&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test2/COB-INF/block-sitemap.xmap
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test2/COB-INF/block-sitemap.xmap
Fri Feb  3 10:27:24 2006
@@ -18,36 +18,12 @@
 <!-- SVN $Id:$ -->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
-  <map:components>
-    <map:generators default="file">
-      <map:generator name="file" src="org.apache.cocoon.generation.FileGenerator"/>
-    </map:generators>
-
-    <map:transformers default="xslt">
-      <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"/>
-    </map:transformers>
-
-    <map:serializers default="xml">
-      <map:serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
-    </map:serializers>
-
-    <map:matchers default="wildcard">
-      <map:matcher name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
-    </map:matchers>
-
-    <map:pipes default="noncaching">
-      <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline">
-      </map:pipe>
-    </map:pipes>
-  </map:components>
-
   <map:pipelines>
     <map:pipeline>
 
       <map:match pattern="test">
         <map:generate src="test.xml"/>
-        <map:serialize/>
+        <map:serialize type="xml"/>
       </map:match>
 
     </map:pipeline>

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test3/COB-INF/block-sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test3/COB-INF/block-sitemap.xmap?rev=374720&r1=374719&r2=374720&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test3/COB-INF/block-sitemap.xmap
(original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/test3/COB-INF/block-sitemap.xmap
Fri Feb  3 10:27:24 2006
@@ -24,10 +24,6 @@
       <component-instance name="block-property"  class="org.apache.cocoon.components.modules.input.BlockPropertyModule"/>
     </input-modules>
 
-    <map:serializers default="xml">
-      <map:serializer mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
-    </map:serializers>
-
     <map:readers default="resource">
       <map:reader name="resource" src="org.apache.cocoon.reading.ResourceReader"/>
     </map:readers>
@@ -38,12 +34,12 @@
 
       <map:match type="wildcard" pattern="test">
         <map:generate type="file" src="test.xml"/>
-        <map:serialize/>
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match type="wildcard" pattern="test4">
         <map:generate type="file" src="block:super:/test"/>
-        <map:serialize/>
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match type="wildcard" pattern="prop">
@@ -53,7 +49,7 @@
           <map:parameter name="bar" value="{block-property:bar}"/>
           <map:parameter name="baz" value="{block-property:baz}"/>
         </map:transform>
-        <map:serialize/>
+        <map:serialize type="xml"/>
       </map:match>
 
       <map:match type="wildcard" pattern="**">



Mime
View raw message