add a redirect to the current block

git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk/tools/cocoon-block-deployer@418112 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 29, 2006 · e0494d6 · e0494d6
1 parent dae1354
commit e0494d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/...on-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java b/...on-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
@@ -207,6 +207,8 @@ protected void blockDeploymentMonolithicCocoon(final String blocksdir, final Dev
         } catch (FileNotFoundException e) {
             throw new MojoExecutionException("Problems with setting the basedir of this block.", e);
         }
+        // it is important that the current block is put at the end of the array - the 
+        // MonotlithicCocoonDeployer expects this
         DevelopmentBlock[] extBlocks = new DevelopmentBlock[blocks.length + 1];
         System.arraycopy(blocks, 0, extBlocks, 0, blocks.length);
         extBlocks[blocks.length] = curBlock;

diff --git a/...n/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java b/...n/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java
@@ -76,6 +76,7 @@ public void deploy(final Map libraries, final File basedir, final String blocksd
         if(developmentBlocks != null && developmentBlocks.length > 0) {      	
 	        Map templateObjects = new HashMap();
 	        templateObjects.put("devblocks", developmentBlocks);
+            templateObjects.put("curblock", developmentBlocks[developmentBlocks.length - 1]);
 	        writeStringTemplateToFile(basedir, "sitemap.xmap", templateObjects);
 	        writeStringTemplateToFile(basedir, "WEB-INF/cocoon.xconf", templateObjects);
 

diff --git a/...ployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/sitemap.xmap b/...ployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/sitemap.xmap
@@ -26,6 +26,9 @@
 
   <map:pipelines>
     <map:pipeline>
+      <map:match pattern="">
+        <map:redirect-to uri="blocks/$curblock.artifactId$/"/>
+      </map:match>
       $devblocks:{ devblock |    
         $if(devblock.cobInfPath)$  
           <map:match pattern="blocks/$devblock.artifactId$/**">