svn commit: r376724 - /cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java

[re...@apache.org]

Author: reinhard
Date: Fri Feb 10 07:10:14 2006
New Revision: 376724

URL: http://svn.apache.org/viewcvs?rev=376724&view=rev
Log:
- use cocoon-default as default (will be configureable in the future in order to use different blocks-fw implementations)
- fix wrong dependency on webapp

Modified:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java?rev=376724&r1=376723&r2=376724&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java Fri Feb 10 07:10:14 2006
@@ -16,25 +16,22 @@
  */
 package org.apache.cocoon.maven.deployer;
 
+import java.util.List;
+
 import org.apache.cocoon.deployer.BlockDeployer;
 import org.apache.cocoon.deployer.generated.deploy.x10.Block;
 import org.apache.cocoon.deployer.generated.deploy.x10.Cocoon;
 import org.apache.cocoon.deployer.generated.deploy.x10.Deploy;
 import org.apache.cocoon.deployer.generated.deploy.x10.Mount;
 import org.apache.cocoon.deployer.resolver.NullVariableResolver;
-
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
-
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.MavenMetadataSource;
 
-import java.util.List;
-
 
 /**
  * This Mojo is used to deploy a single Cocoon block, usually just at development time. All block dependencies
@@ -130,9 +127,10 @@
         Cocoon cocoon = new Cocoon();
         cocoon.setExclusive(true);
         cocoon.setTargetUrl("target/cocoon-webapp");
-        cocoon.setWebappUrn("org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war");
-        cocoon.setBlockFwUrn("org.apache.cocoon:cocoon-blocks-fw-impl:1.0-SNAPSHOT");
+        cocoon.setWebappUrn("org.apache.cocoon:cocoon-deployer-minimal-webapp:1.0-SNAPSHOT:war");
+        cocoon.setBlockFwUrn("org.apache.cocoon:cocoon-default:1.0-SNAPSHOT");
         
+        // create the block
         Block block = new Block();
         block.setId(artifactId);
         block.setAutoWire(true);
@@ -141,9 +139,10 @@
         block.setMount(mount);
         
         block.setUrn(urn);
-        // Disabled for now! Using block.setLocation() make rapid application development possible.
-        // block.setLocation("target/classes");
-
+        // needs to be commented out as long as the blocks-fw supports directories outside
+        // of the servlet context
+//        block.setLocation("target/classes");
+                
         // create the deployment object
         Deploy deploy = new Deploy();
         deploy.setCocoon(cocoon);