maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
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 GMT
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



Mime
View raw message