You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/02/11 11:44:11 UTC

svn commit: r376962 - in /cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources: COB-INF/sitemap.xmap META-INF/block.xml

Author: reinhard
Date: Sat Feb 11 02:44:10 2006
New Revision: 376962

URL: http://svn.apache.org/viewcvs?rev=376962&view=rev
Log:
COCOON-1750

- use another block from within the sitemap
- fix ordering as we have some troubles with loading components.
(I will clearify with Daniel who has to makes sure that the ordering of requirements in 
 block.xml isn't significant)

Modified:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap?rev=376962&r1=376961&r2=376962&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/COB-INF/sitemap.xmap Sat Feb 11 02:44:10 2006
@@ -22,6 +22,10 @@
         <map:generate src="test.xml"/>
         <map:serialize type="xml"/>
       </map:match>
+      <map:match pattern="test1">
+        <map:generate src="block:otherBlock:/test"/>
+        <map:serialize/>       
+      </map:match>
     </map:pipeline>
   </map:pipelines>
 

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml?rev=376962&r1=376961&r2=376962&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml Sat Feb 11 02:44:10 2006
@@ -31,6 +31,8 @@
     <sitemap file="COB-INF/sitemap.xmap"/>
   </servlet>  
   <requirements>
+    <requires interface="http://cocoon.apache.org/blocks/tutorial-1/1.0" name="otherBlock"
+      default="org.apache.cocoon:cocoon-tutorial-simple-block:1.0-SNAPSHOT"/>    
     <requires interface="http://cocoon.apache.org/blocks/core-components/1.0" 
       name="core" default="org.apache.cocoon:cocoon-core-components:1.0-SNAPSHOT"/>
   </requirements>