Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 51425 invoked from network); 7 May 2007 14:36:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 May 2007 14:36:09 -0000 Received: (qmail 91435 invoked by uid 500); 7 May 2007 14:36:15 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 91405 invoked by uid 500); 7 May 2007 14:36:15 -0000 Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: scm-dev@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Received: (qmail 91392 invoked by uid 99); 7 May 2007 14:36:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2007 07:36:15 -0700 X-ASF-Spam-Status: No, hits=-98.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,USERPASS 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, 07 May 2007 07:36:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 880371A9838; Mon, 7 May 2007 07:35:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r535886 - in /maven/scm/trunk: maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/ maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/j... Date: Mon, 07 May 2007 14:35:47 -0000 To: scm-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070507143547.880371A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Mon May 7 07:35:46 2007 New Revision: 535886 URL: http://svn.apache.org/viewvc?view=rev&rev=535886 Log: [SCM-307] Allow to use a hostname with file protocol Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java maven/scm/trunk/maven-scm-site/src/site/apt/subversion.apt Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java?view=diff&rev=535886&r1=535885&r2=535886 ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java Mon May 7 07:35:46 2007 @@ -161,9 +161,9 @@ if ( url.startsWith( "file" ) ) { - if ( !url.startsWith( "file:///" ) && !url.startsWith( "file://localhost/" ) ) + if ( !url.startsWith( "file://" ) ) { - result.messages.add( "A svn 'file' url must be on the form 'file:///' or 'file://localhost/'." ); + result.messages.add( "A svn 'file' url must be on the form 'file://[hostname]/'." ); return result; } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java?view=diff&rev=535886&r1=535885&r2=535886 ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java Mon May 7 07:35:46 2007 @@ -57,6 +57,12 @@ testUrl( "scm:svn:file://localhost/tmp/repo", "file://localhost/tmp/repo", null, null, null ); } + public void testLegalHistnameFileURL() + throws Exception + { + testUrl( "scm:svn:file://my_server/tmp/repo", "file://my_server/tmp/repo", null, null, null ); + } + public void testLegalHttpURL() throws Exception { Modified: maven/scm/trunk/maven-scm-site/src/site/apt/subversion.apt URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-site/src/site/apt/subversion.apt?view=diff&rev=535886&r1=535885&r2=535886 ============================================================================== --- maven/scm/trunk/maven-scm-site/src/site/apt/subversion.apt (original) +++ maven/scm/trunk/maven-scm-site/src/site/apt/subversion.apt Mon May 7 07:35:46 2007 @@ -21,8 +21,7 @@ ------- scm:svn:svn://[username[:password]@]server_name[:port]/path_to_repository scm:svn:svn+ssh://[username@]server_name[:port]/path_to_repository -scm:svn:file:///path_to_repository -scm:svn:file://localhost/path_to_repository +scm:svn:file://[hostname]/path_to_repository scm:svn:http://[username[:password]@]server_name[:port]/path_to_repository scm:svn:https://[username[:password]@]server_name[:port]/path_to_repository ------- @@ -31,6 +30,8 @@ ------- scm:svn:file:///svn/root/module +scm:svn:file://localhost/path_to_repository +scm:svn:file://my_server/path_to_repository scm:svn:http://svn.apache.org/svn/root/module scm:svn:https://username@svn.apache.org/svn/root/module scm:svn:https://username:password@svn.apache.org/svn/root/module