Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 58788 invoked from network); 12 Jun 2006 14:51:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jun 2006 14:51:05 -0000 Received: (qmail 49420 invoked by uid 500); 12 Jun 2006 14:50:57 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 49314 invoked by uid 500); 12 Jun 2006 14:50:57 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 49252 invoked by uid 99); 12 Jun 2006 14:50:57 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2006 07:50:56 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2006 07:50:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 57A4D1A983A; Mon, 12 Jun 2006 07:50:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413672 - /cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployExplodedMojo.java Date: Mon, 12 Jun 2006 14:50:35 -0000 To: cvs@cocoon.apache.org From: reinhard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060612145036.57A4D1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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);