Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 97987 invoked from network); 30 Nov 2005 00:06:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Nov 2005 00:06:55 -0000 Received: (qmail 48135 invoked by uid 500); 30 Nov 2005 00:06:54 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 48091 invoked by uid 500); 30 Nov 2005 00:06:53 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 48080 invoked by uid 99); 30 Nov 2005 00:06:53 -0000 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; Tue, 29 Nov 2005 16:06:53 -0800 Received: (qmail 97931 invoked by uid 65534); 30 Nov 2005 00:06:33 -0000 Message-ID: <20051130000633.97930.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r349847 - /maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java Date: Wed, 30 Nov 2005 00:06:32 -0000 To: commits@maven.apache.org From: carlos@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: carlos Date: Tue Nov 29 16:06:30 2005 New Revision: 349847 URL: http://svn.apache.org/viewcvs?rev=349847&view=rev Log: Refactor Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java?rev=349847&r1=349846&r2=349847&view=diff ============================================================================== --- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java (original) +++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java Tue Nov 29 16:06:30 2005 @@ -37,35 +37,34 @@ protected void executeTasks( Target antTasks, MavenProject mavenProject ) throws MojoExecutionException { - try + try { - PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper( - antTasks.getProject() - ); + Project antProject = antTasks.getProject(); - propertyHelper.setNext( - new AntPropertyHelper( mavenProject, getLog() ) - ); + PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper( antProject ); + + propertyHelper.setNext( new AntPropertyHelper( mavenProject, getLog() ) ); DefaultLogger antLogger = new DefaultLogger(); antLogger.setOutputPrintStream( System.out ); antLogger.setErrorPrintStream( System.err ); antLogger.setMessageOutputLevel( Project.MSG_INFO ); - antTasks.getProject().addBuildListener( antLogger ); - antTasks.getProject().setBaseDir( mavenProject.getBasedir() ); + antProject.addBuildListener( antLogger ); + antProject.setBaseDir( mavenProject.getBasedir() ); - Path p = new Path( antTasks.getProject() ); + Path p = new Path( antProject ); p.setPath( StringUtils.join( mavenProject.getArtifacts().iterator(), File.pathSeparator ) ); - antTasks.getProject().addReference( "maven.dependency.classpath", p ); + antProject.addReference( "maven.dependency.classpath", p ); + p = new Path( antProject ); p.setPath( StringUtils.join( mavenProject.getCompileClasspathElements().iterator(), File.pathSeparator ) ); - antTasks.getProject().addReference( "maven.compile.classpath", p ); - p = new Path( antTasks.getProject() ); + antProject.addReference( "maven.compile.classpath", p ); + p = new Path( antProject ); p.setPath( StringUtils.join( mavenProject.getRuntimeClasspathElements().iterator(), File.pathSeparator ) ); - antTasks.getProject().addReference( "maven.runtime.classpath", p ); - p = new Path( antTasks.getProject() ); + antProject.addReference( "maven.runtime.classpath", p ); + p = new Path( antProject ); p.setPath( StringUtils.join( mavenProject.getTestClasspathElements().iterator(), File.pathSeparator ) ); - antTasks.getProject().addReference( "maven.test.classpath", p ); + antProject.addReference( "maven.test.classpath", p ); getLog().info( "Executing tasks" );