From easyant-commits-return-516-apmail-incubator-easyant-commits-archive=incubator.apache.org@incubator.apache.org Sat Sep 8 14:15:30 2012 Return-Path: X-Original-To: apmail-incubator-easyant-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-easyant-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 13956D3CE for ; Sat, 8 Sep 2012 14:15:30 +0000 (UTC) Received: (qmail 73609 invoked by uid 500); 8 Sep 2012 14:15:29 -0000 Delivered-To: apmail-incubator-easyant-commits-archive@incubator.apache.org Received: (qmail 73587 invoked by uid 500); 8 Sep 2012 14:15:29 -0000 Mailing-List: contact easyant-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: easyant-dev@incubator.apache.org Delivered-To: mailing list easyant-commits@incubator.apache.org Received: (qmail 73578 invoked by uid 99); 8 Sep 2012 14:15:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Sep 2012 14:15:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Sep 2012 14:15:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 04F472388900; Sat, 8 Sep 2012 14:14:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1382307 - in /incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks: AbstractImport.java Import.java Date: Sat, 08 Sep 2012 14:14:42 -0000 To: easyant-commits@incubator.apache.org From: jlboudart@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120908141443.04F472388900@eris.apache.org> Author: jlboudart Date: Sat Sep 8 14:14:42 2012 New Revision: 1382307 URL: http://svn.apache.org/viewvc?rev=1382307&view=rev Log: Make changing option configurable on import Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/Import.java Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java?rev=1382307&r1=1382306&r2=1382307&view=diff ============================================================================== --- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java (original) +++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java Sat Sep 8 14:14:42 2012 @@ -14,7 +14,6 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.ImportTask; import org.apache.tools.ant.types.Path; - /** * This abstract task is used to include / import modules. * @@ -37,6 +36,7 @@ public abstract class AbstractImport ext private String buildConfigurations; private String mainConf = "default"; private String providedConf = "provided"; + private boolean changing = false; public AbstractImport() { super(); @@ -45,11 +45,12 @@ public abstract class AbstractImport ext /** * Import a module * - * @param moduleRevisionId {@link ModuleRevisionId} of main artifact + * @param moduleRevisionId + * {@link ModuleRevisionId} of main artifact * @param report * a resolved report of the module to import */ - protected void importModule(ModuleRevisionId moduleRevisionId,ResolveReport report) { + protected void importModule(ModuleRevisionId moduleRevisionId, ResolveReport report) { // Check dependency on core checkCoreCompliance(report, providedConf); @@ -63,7 +64,8 @@ public abstract class AbstractImport ext } else if ("jar".equals(artifact.getType())) { path.createPathElement().setLocation(artifact.getLocalFile()); } else { - handleOtherResourceFile(moduleRevisionId, artifact.getName(), artifact.getExt(), artifact.getLocalFile()); + handleOtherResourceFile(moduleRevisionId, artifact.getName(), artifact.getExt(), + artifact.getLocalFile()); } } if (antFile != null && antFile.exists()) { @@ -105,12 +107,16 @@ public abstract class AbstractImport ext * The '.artifact' is optional when module name and artifact name are the same. [organisation].[module].[type].file *

* - * @param moduleRevisionId a {@link ModuleRevisionId} of the main artifact - * @param artifactName artifact name - * @param artifactExtension artifact extension name + * @param moduleRevisionId + * a {@link ModuleRevisionId} of the main artifact + * @param artifactName + * artifact name + * @param artifactExtension + * artifact extension name * @param localResourceFile */ - protected void handleOtherResourceFile(ModuleRevisionId moduleRevisionId, String artifactName, String artifactExtension, File localResourceFile) { + protected void handleOtherResourceFile(ModuleRevisionId moduleRevisionId, String artifactName, + String artifactExtension, File localResourceFile) { StringBuilder sb = new StringBuilder(); sb.append(moduleRevisionId.getOrganisation()); sb.append("#"); @@ -123,7 +129,9 @@ public abstract class AbstractImport ext sb.append(artifactExtension); sb.append(".file"); - getProject().log("registering location of artifact " + artifactName + " ext" + artifactExtension + " on " +sb.toString(),Project.MSG_DEBUG); + getProject().log( + "registering location of artifact " + artifactName + " ext" + artifactExtension + " on " + + sb.toString(), Project.MSG_DEBUG); getProject().setNewProperty(sb.toString(), localResourceFile.getAbsolutePath()); } @@ -320,4 +328,12 @@ public abstract class AbstractImport ext } + public boolean isChanging() { + return changing; + } + + public void setChanging(boolean changing) { + this.changing = changing; + } + } \ No newline at end of file Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/Import.java URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/Import.java?rev=1382307&r1=1382306&r2=1382307&view=diff ============================================================================== --- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/Import.java (original) +++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/Import.java Sat Sep 8 14:14:42 2012 @@ -97,7 +97,7 @@ public class Import extends AbstractImpo } else { try { ResolveReport report = getEasyAntIvyInstance().getResolveEngine().resolve(moduleRevisionId, - configureResolveOptions(), true); + configureResolveOptions(), isChanging()); importModule(moduleRevisionId,report); } catch (ParseException e) { throw new BuildException("Can't parse module descriptor", e); @@ -203,4 +203,5 @@ public class Import extends AbstractImpo public void setMrid(String mrid) { this.mrid = mrid; } + }