Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 93118 invoked from network); 19 Jul 2006 20:49:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jul 2006 20:49:47 -0000 Received: (qmail 93287 invoked by uid 500); 19 Jul 2006 20:49:46 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 93162 invoked by uid 500); 19 Jul 2006 20:49:46 -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 93151 invoked by uid 99); 19 Jul 2006 20:49:46 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jul 2006 13:49:46 -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; Wed, 19 Jul 2006 13:49:45 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C46BC1A981A; Wed, 19 Jul 2006 13:49:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r423598 - /cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java Date: Wed, 19 Jul 2006 20:49:25 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060719204925.C46BC1A981A@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: cziegeler Date: Wed Jul 19 13:49:24 2006 New Revision: 423598 URL: http://svn.apache.org/viewvc?rev=423598&view=rev Log: Remove wrong scope check Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java 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=423598&r1=423597&r2=423598&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 Wed Jul 19 13:49:24 2006 @@ -231,45 +231,43 @@ Map files = new HashMap(); for(Iterator it = this.getProject().getArtifacts().iterator(); it.hasNext(); ) { Artifact artifact = (Artifact) it.next(); - if ( artifact.getScope() == Artifact.SCOPE_RUNTIME ) { - String id = artifact.getArtifactId(); - if (files.containsKey(id)) { - // Now search for all artifacts and print their dependency trail - StringBuffer msg = new StringBuffer("There are at least two artifacts with the ID '"); - msg.append(id); - msg.append("':"); - msg.append(SystemUtils.LINE_SEPARATOR); - for(Iterator ai = this.getProject().getArtifacts().iterator(); ai.hasNext(); ) { - final Artifact current = (Artifact) ai.next(); - if ( current.getArtifactId().equals(id) ) { - msg.append(artifact); - msg.append(SystemUtils.LINE_SEPARATOR); - final List l = current.getDependencyTrail(); - final Iterator i = l.iterator(); - while ( i.hasNext() ) { - msg.append(" "); - msg.append(i.next().toString()); - msg.append(SystemUtils.LINE_SEPARATOR); - } - } - } - throw new MojoExecutionException(msg.toString()); - } - if (containsArtifact(excludedBlocks, artifact.getArtifactId(), artifact.getGroupId())) { - this.getLog().debug("Skipping " + artifact); - } else { - files.put(id, artifact.getFile()); - if ( this.getLog().isDebugEnabled() ) { - StringBuffer msg = new StringBuffer("Deploying " + artifact); - final List l = artifact.getDependencyTrail(); + String id = artifact.getArtifactId(); + if (files.containsKey(id)) { + // Now search for all artifacts and print their dependency trail + StringBuffer msg = new StringBuffer("There are at least two artifacts with the ID '"); + msg.append(id); + msg.append("':"); + msg.append(SystemUtils.LINE_SEPARATOR); + for(Iterator ai = this.getProject().getArtifacts().iterator(); ai.hasNext(); ) { + final Artifact current = (Artifact) ai.next(); + if ( current.getArtifactId().equals(id) ) { + msg.append(artifact); + msg.append(SystemUtils.LINE_SEPARATOR); + final List l = current.getDependencyTrail(); final Iterator i = l.iterator(); while ( i.hasNext() ) { msg.append(" "); msg.append(i.next().toString()); msg.append(SystemUtils.LINE_SEPARATOR); } - this.getLog().debug(msg.toString()); } + } + throw new MojoExecutionException(msg.toString()); + } + if (containsArtifact(excludedBlocks, artifact.getArtifactId(), artifact.getGroupId())) { + this.getLog().debug("Skipping " + artifact); + } else { + files.put(id, artifact.getFile()); + if ( this.getLog().isDebugEnabled() ) { + StringBuffer msg = new StringBuffer("Deploying " + artifact); + final List l = artifact.getDependencyTrail(); + final Iterator i = l.iterator(); + while ( i.hasNext() ) { + msg.append(" "); + msg.append(i.next().toString()); + msg.append(SystemUtils.LINE_SEPARATOR); + } + this.getLog().debug(msg.toString()); } } }