Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 53283 invoked from network); 15 Jul 2008 11:26:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Jul 2008 11:26:18 -0000 Received: (qmail 68119 invoked by uid 500); 15 Jul 2008 11:26:17 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 68069 invoked by uid 500); 15 Jul 2008 11:26:17 -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 68060 invoked by uid 99); 15 Jul 2008 11:26:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jul 2008 04:26:17 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 15 Jul 2008 11:25:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CC6652388A06; Tue, 15 Jul 2008 04:25:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r676876 - /maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Date: Tue, 15 Jul 2008 11:25:26 -0000 To: commits@maven.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080715112526.CC6652388A06@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Tue Jul 15 04:25:26 2008 New Revision: 676876 URL: http://svn.apache.org/viewvc?rev=676876&view=rev Log: Fix for artifact path. Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=676876&r1=676875&r2=676876&view=diff ============================================================================== --- maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original) +++ maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Tue Jul 15 04:25:26 2008 @@ -93,13 +93,12 @@ model.getVersion()); if (mavenProject.getBuild() != null && mavenProject.getBuild().getOutputDirectory() != null && mavenProject.getBuild().getFinalName() != null) { - File artifactFile = new File(mavenProject.getBuild().getOutputDirectory(), mavenProject.getBuild().getFinalName()); + File artifactFile = new File(mavenProject.getBuild().getDirectory(), mavenProject.getBuild().getFinalName() + + "." + mavenProject.getPackaging());//TODO: fix extension if (!artifactFile.exists()) { throw new IOException("Artifact does not exist: File = " + artifactFile.getAbsolutePath()); } artifact.setFile(artifactFile); - } else { - logger.warn("Build section of pom is null"); } mavenProject.setArtifact(artifact);