maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r369177 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java maven-scm-site/pom.xml maven-scm-site/src/site/apt/cvs.apt maven-scm-site/src/site/apt/scm-url-format.apt
Date Sun, 15 Jan 2006 04:56:51 GMT
Author: evenisse
Date: Sat Jan 14 20:56:46 2006
New Revision: 369177

URL: http://svn.apache.org/viewcvs?rev=369177&view=rev
Log:
[SCM-101][SCM-106] Add more info about url formats. Fix ambiquities between code and site.

Modified:
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
    maven/scm/trunk/maven-scm-site/pom.xml
    maven/scm/trunk/maven-scm-site/src/site/apt/cvs.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=369177&r1=369176&r2=369177&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
Sat Jan 14 20:56:46 2006
@@ -42,7 +42,7 @@
     implements ScmManager
 {
     private final static String ILLEGAL_SCM_URL = "The scm url must be on the form "
-                                                  + "'scm:<scm provider><delimiter><provider
specific part>' "
+                                                  + "'scm<delimiter><scm provider><delimiter><provider
specific part>' "
                                                   + "where <delimiter> can be either
':' or '|'.";
 
     private Map scmProviders = new HashMap();
@@ -213,9 +213,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;
         }
@@ -292,4 +292,4 @@
 
         return scmUrl.charAt( index );
     }
-}
\ No newline at end of file
+}

Modified: maven/scm/trunk/maven-scm-site/pom.xml
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/pom.xml?rev=369177&r1=369176&r2=369177&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-site/pom.xml (original)
+++ maven/scm/trunk/maven-scm-site/pom.xml Sat Jan 14 20:56:46 2006
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>maven-scm</artifactId>
     <groupId>org.apache.maven.scm</groupId>
-    <version>1.0-beta-2-SNAPSHOT</version>
+    <version>1.0-beta-3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-scm-site</artifactId>

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=369177&r1=369176&r2=369177&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 Sat Jan 14 20:56:46 2006
@@ -16,7 +16,29 @@
 
 * SCM Url
 
-    For all URLs below, we use a colon (:) as separator. If you use a colon for one of the
variables (e.g. a windows path), then use a pipe (|) as separator.
+  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
+-------
+
+  As delimiter you can use either colon ':' or, if you use a colon for one
+  of the variables (e.g. a windows path), a pipe '|'.
+
+  The following methods are supported:
+
+  * local, connecting to the local file system
+
+  * lserver, connecting to a local server
+
+  * pserver, connecting to a password-authenticating server
+
+  * ext, connecting to a server using an external rsh program
+
+  []
+
+  Here are the format for each of the supported methods, using colon as
+  delimiter.
 
 -------
 scm:cvs:local:path_to_repository:module_name
@@ -29,10 +51,10 @@
 
 -------
 scm:cvs:pserver:anoncvs:@cvs.apache.org:/cvs/root:module
+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
 -------
 
-* Informations
-
-    If you use an anonymous access, you need to add a colon (:) between login and "@" like
it's done in the first example.
+  If you use anonymous access, with an empty password, you need to add a colon (:) between
the username and "@" like it's done in the first example.
+  This tells the SCM provider that there is a password and that it is empty.

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=369177&r1=369176&r2=369177&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 Sat Jan 14 20:56:46 2006
@@ -1,23 +1,23 @@
  ------
- URL format
+ SCM URL format
  ------
  Emmanuel Venisse
  ------
  28 June 2005
  ------
 
-SCM URL Formats
+SCM URL Format
 
-  For all URLs below, we use a colon as separator, but you can use any other character. The
pipe character is too a common separator.
+* SCM Url
 
-  * {{{clearcase.html}Clearcase}}
+  The general format for a SCM Url is
 
-  * {{{cvs.html}CVS}}
+-------
+scm<delimiter><scm_provider><delimiter><provider_specific_part>
+-------
 
-  * {{{local.html}Local}}
+  As delimiter you can use either colon ':' or, if you use a colon for one
+  of the variables (e.g. a windows path), you can use a pipe '|'.
 
-  * {{{perforce.html}Perforce}}
-
-  * {{{starteam.html}Starteam}}
-
-  * {{{subversion.html}Subversion}}
+  For information about the provider specific part, see the appropriate
+  {{{scms-overview.html}SCM implementation}}.



Mime
View raw message