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/06/29 20:37:51 UTC
svn commit: r418112 - in
/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main:
java/org/apache/cocoon/maven/deployer/
java/org/apache/cocoon/maven/deployer/monolithic/
resources/org/apache/cocoon/maven/deployer/monolithic/
Author: reinhard
Date: Thu Jun 29 11:37:51 2006
New Revision: 418112
URL: http://svn.apache.org/viewvc?rev=418112&view=rev
Log:
add a redirect to the current block
Modified:
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/sitemap.xmap
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java?rev=418112&r1=418111&r2=418112&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java Thu Jun 29 11:37:51 2006
@@ -207,6 +207,8 @@
} 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;
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java?rev=418112&r1=418111&r2=418112&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java Thu Jun 29 11:37:51 2006
@@ -76,6 +76,7 @@
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);
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/sitemap.xmap?rev=418112&r1=418111&r2=418112&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/sitemap.xmap (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/sitemap.xmap Thu Jun 29 11:37:51 2006
@@ -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$/**">