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/12 16:50:35 UTC

svn commit: r413672 - /cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java

Author: reinhard
Date: Mon Jun 12 07:50:35 2006
New Revision: 413672

URL: http://svn.apache.org/viewvc?rev=413672&view=rev
Log:
differentiate based on the packaging type

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

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java?rev=413672&r1=413671&r2=413672&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java Mon Jun 12 07:50:35 2006
@@ -45,18 +45,18 @@
      * 
      * @parameter
      */
-    private DevelopmentBlock[] blocks;
+    private DevelopmentBlock[] blocks = new DevelopmentBlock[0];
     
     /**
      * Custom Cocoon properties
      * 
      * @parameter
      */
-    private DevelopmentProperty[] properties;        
+    private DevelopmentProperty[] properties = new DevelopmentProperty[0];
 	
 	public void execute() throws MojoExecutionException {
 		if(this.serverVersion.equals("2.2")) {
-            if(this.blocks == null) {
+            if(this.getProject().getPackaging().equals("war")) {
                 this.deployMonolithicCocoonAppAsWebapp(this.blocksdir);
             } else {
                 this.blockDeploymentMonolithicCocoon(this.blocksdir, this.blocks, this.properties);