Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 24689 invoked from network); 6 Aug 2007 22:21:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Aug 2007 22:21:31 -0000 Received: (qmail 29699 invoked by uid 500); 6 Aug 2007 22:21:30 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 29662 invoked by uid 500); 6 Aug 2007 22:21:30 -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 29649 invoked by uid 99); 6 Aug 2007 22:21:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Aug 2007 15:21:30 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Aug 2007 22:21:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D05E11A981A; Mon, 6 Aug 2007 15:21:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r563308 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java Date: Mon, 06 Aug 2007 22:21:08 -0000 To: commits@maven.apache.org From: jdcasey@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070806222108.D05E11A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdcasey Date: Mon Aug 6 15:21:07 2007 New Revision: 563308 URL: http://svn.apache.org/viewvc?view=rev&rev=563308 Log: Specify a default classifier in addition to the default type for resolving standard descriptor artifacts. Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?view=diff&rev=563308&r1=563307&r2=563308 ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java Mon Aug 6 15:21:07 2007 @@ -76,7 +76,7 @@ strategies.add( new RelativeFileLocatorStrategy( configSource.getBasedir() ) ); strategies.add( new ArtifactLocatorStrategy( factory, resolver, configSource.getLocalRepository(), - configSource.getRemoteRepositories(), "assembly-descriptor" ) ); + configSource.getRemoteRepositories(), "xml", "assembly-descriptor" ) ); strategies.add( prefixedClasspathStrategy ); strategies.add( classpathStrategy );