maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r371877 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java maven-scm-site/src/site/apt/cvs.apt maven-scm-site/src/site/apt/local.apt maven-scm-site/src/site/apt/scm-url-format.apt
Date Tue, 24 Jan 2006 10:02:23 GMT
Author: evenisse
Date: Tue Jan 24 02:02:15 2006
New Revision: 371877

URL: http://svn.apache.org/viewcvs?rev=371877&view=rev
Log:
[SCM-106] Don't allow '|' after 'scm' in url. Scm url must start with "scm:" so it respect
RFC2396 [2] section 3 "URI Syntactic Components".
Submitted by: Dennis Lundberg

Modified:
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
    maven/scm/trunk/maven-scm-site/src/site/apt/cvs.apt
    maven/scm/trunk/maven-scm-site/src/site/apt/local.apt
    maven/scm/trunk/maven-scm-site/src/site/apt/scm-url-format.apt

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java?rev=371877&r1=371876&r2=371877&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
(original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
Tue Jan 24 02:02:15 2006
@@ -40,7 +40,7 @@
     implements ScmManager
 {
     private final static String ILLEGAL_SCM_URL = "The scm url must be on the form " +
-        "'scm<delimiter><scm provider><delimiter><provider specific
part>' " +
+        "'scm:<scm provider><delimiter><provider specific part>' " +
         "where <delimiter> can be either ':' or '|'.";
 
     private Map scmProviders = new HashMap();
@@ -211,9 +211,9 @@
             throw new NullPointerException( "The scm url cannot be null." );
         }
 
-        if ( !scmUrl.startsWith( "scm" ) )
+        if ( !scmUrl.startsWith( "scm:" ) )
         {
-            messages.add( "The scm url must start with 'scm'." );
+            messages.add( "The scm url must start with 'scm:'." );
 
             return messages;
         }

Modified: maven/scm/trunk/maven-scm-site/src/site/apt/cvs.apt
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/src/site/apt/cvs.apt?rev=371877&r1=371876&r2=371877&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-site/src/site/apt/cvs.apt (original)
+++ maven/scm/trunk/maven-scm-site/src/site/apt/cvs.apt Tue Jan 24 02:02:15 2006
@@ -19,7 +19,7 @@
   The general format for a CVS SCM Url is
 
 -------
-scm<delimiter>cvs<delimiter><method>[<delimiter>username_password_servername_port]<delimiter>path_to_repository<delimiter>module_name
+scm:cvs<delimiter><method>[<delimiter>username_password_servername_port]<delimiter>path_to_repository<delimiter>module_name
 -------
 
   As delimiter you can use either colon ':' or, if you use a colon for one
@@ -51,7 +51,7 @@
 
 -------
 scm:cvs:pserver:anoncvs:@cvs.apache.org:/cvs/root:module
-scm|cvs|pserver|username@localhost|C:/Program Files/cvsnt/repositories|module_name
+scm:cvs|pserver|username@localhost|C:/Program Files/cvsnt/repositories|module_name
 scm:cvs:ext:username@cvs.apache.org:/cvs/root:module
 scm:cvs:local:/cvs/root:module
 -------

Modified: maven/scm/trunk/maven-scm-site/src/site/apt/local.apt
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/src/site/apt/local.apt?rev=371877&r1=371876&r2=371877&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-site/src/site/apt/local.apt (original)
+++ maven/scm/trunk/maven-scm-site/src/site/apt/local.apt Tue Jan 24 02:02:15 2006
@@ -30,6 +30,6 @@
 * Examples
 
 -------
-scm:local:/usr/modules/my_module
-scm|local|C:/javaprojects|my_module
+scm:local:/usr/modules:my_module
+scm:local|C:/javaprojects|my_module
 -------

Modified: maven/scm/trunk/maven-scm-site/src/site/apt/scm-url-format.apt
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/src/site/apt/scm-url-format.apt?rev=371877&r1=371876&r2=371877&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-site/src/site/apt/scm-url-format.apt (original)
+++ maven/scm/trunk/maven-scm-site/src/site/apt/scm-url-format.apt Tue Jan 24 02:02:15 2006
@@ -13,7 +13,7 @@
   The general format for a SCM Url is
 
 -------
-scm<delimiter><scm_provider><delimiter><provider_specific_part>
+scm:<scm_provider><delimiter><provider_specific_part>
 -------
 
   As delimiter you can use either colon ':' or, if you use a colon for one



Mime
View raw message