From continuum-commits-return-1338-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Wed Dec 07 15:24:20 2005 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 34295 invoked from network); 7 Dec 2005 15:24:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Dec 2005 15:24:12 -0000 Received: (qmail 43195 invoked by uid 500); 7 Dec 2005 15:24:00 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 43171 invoked by uid 500); 7 Dec 2005 15:24:00 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 43158 invoked by uid 99); 7 Dec 2005 15:24:00 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2005 07:24:00 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 07 Dec 2005 07:23:59 -0800 Received: (qmail 32635 invoked by uid 65534); 7 Dec 2005 15:23:28 -0000 Message-ID: <20051207152327.32463.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r354767 - in /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum: DefaultContinuum.java execution/ant/AntBuildExecutor.java Date: Wed, 07 Dec 2005 15:23:13 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Wed Dec 7 07:23:06 2005 New Revision: 354767 URL: http://svn.apache.org/viewcvs?rev=354767&view=rev Log: PR: CONTINUUM-487 Submitted by: Nick Gonzalez Allow for specifying the location of the Ant build file Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=354767&r1=354766&r2=354767&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Wed Dec 7 07:23:06 2005 @@ -599,6 +599,8 @@ bd.setDefaultForProject( true ); + bd.setGoals( "" ); + bd.setArguments( "" ); bd.setBuildFile( "build.xml" ); Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java?rev=354767&r1=354766&r2=354767&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java Wed Dec 7 07:23:06 2005 @@ -63,8 +63,16 @@ // TODO: get from installation // String executable = project.getExecutable(); String executable = "ant"; + + String arguments = ""; + + String buildFile = buildDefinition.getBuildFile(); - String arguments = StringUtils.clean( buildDefinition.getArguments() ) + " " + + if (!StringUtils.isEmpty(buildFile)) { + arguments = "-f " + buildFile + " "; + } + + arguments += StringUtils.clean( buildDefinition.getArguments() ) + " " + StringUtils.clean( buildDefinition.getGoals() ); return executeShellCommand( project, executable, arguments, buildOutput );