Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 31315 invoked from network); 5 May 2009 21:56:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 May 2009 21:56:46 -0000 Received: (qmail 76643 invoked by uid 500); 5 May 2009 21:56:46 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 76548 invoked by uid 500); 5 May 2009 21:56:46 -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 76537 invoked by uid 99); 5 May 2009 21:56:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2009 21:56:46 +0000 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, 05 May 2009 21:56:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 616BE2388BA2; Tue, 5 May 2009 21:56:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r771987 - /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java Date: Tue, 05 May 2009 21:56:23 -0000 To: commits@maven.apache.org From: pgier@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090505215623.616BE2388BA2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pgier Date: Tue May 5 21:56:22 2009 New Revision: 771987 URL: http://svn.apache.org/viewvc?rev=771987&view=rev Log: [MANTTASKS-142] A couple improvements to default remote repository id suggested by Benjamin. Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java?rev=771987&r1=771986&r2=771987&view=diff ============================================================================== --- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java (original) +++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java Tue May 5 21:56:22 2009 @@ -143,7 +143,9 @@ } if ( remoteRepository.getId() == null || remoteRepository.getId().equals( remoteRepository.getUrl() ) ) { - log( "Each remote repository should specify a unique id.", Project.MSG_WARN ); + log( "Each remote repository must specify a unique id. For backward-compatibility, " + + "a default id will be used. In future releases, a missing repository id will raise an error.", + Project.MSG_WARN ); remoteRepository.setId( generateDefaultRepositoryId( remoteRepository ) ); } remoteRepositories.add( remoteRepository ); @@ -151,6 +153,8 @@ public final String MD5_ALGO_NAME = "MD5"; + public final String UTF_ENC_NAME = "UTF-8"; + /** * Generates an MD5 digest based on the url of the repository. * This is safer to use for the id than the url. @@ -164,11 +168,11 @@ try { MessageDigest md = MessageDigest.getInstance( MD5_ALGO_NAME ); - md.update( repository.getUrl().getBytes() ); + md.update( repository.getUrl().getBytes( UTF_ENC_NAME ) ); BigInteger digest = new BigInteger( md.digest() ); return digest.toString( 16 ); } - catch ( NoSuchAlgorithmException e ) + catch ( Exception e ) { log( "Unable to generate unique repository Id: " + e, Project.MSG_WARN ); return "default";