maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r389484 - 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: AbstractSvnScmProvider.java util/SvnUtil.java
Date Tue, 28 Mar 2006 12:13:51 GMT
Author: evenisse
Date: Tue Mar 28 04:13:47 2006
New Revision: 389484

URL: http://svn.apache.org/viewcvs?rev=389484&view=rev
Log:
[SCM-176] Remove duplicated code

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/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java

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/viewcvs/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?rev=389484&r1=389483&r2=389484&view=diff
==============================================================================
--- 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
Tue Mar 28 04:13:47 2006
@@ -185,8 +185,6 @@
 
                 return result;
             }
-
-            protocol = "file://";
         }
         else if ( url.startsWith( "https" ) )
         {
@@ -196,8 +194,6 @@
 
                 return result;
             }
-
-            protocol = "https://";
         }
         else if ( url.startsWith( "http" ) )
         {
@@ -207,8 +203,6 @@
 
                 return result;
             }
-
-            protocol = "http://";
         }
         else if ( url.startsWith( "svn+ssh" ) )
         {
@@ -218,8 +212,6 @@
 
                 return result;
             }
-
-            protocol = "svn+ssh://";
         }
         else if ( url.startsWith( "svn" ) )
         {
@@ -229,29 +221,12 @@
 
                 return result;
             }
-
-            protocol = "svn://";
         }
         else
         {
             result.messages.add( url + " url isn't a valid svn URL." );
 
             return result;
-        }
-
-        String urlPath = url.substring( protocol.length() );
-
-        int indexAt = urlPath.indexOf( "@" );
-
-        if ( indexAt > 0 && !"svn+ssh://".equals( protocol ) )
-        {
-            user = urlPath.substring( 0, indexAt );
-
-            url = protocol + urlPath.substring( indexAt + 1 );
-        }
-        else
-        {
-            url = protocol + urlPath;
         }
 
         result.repository = new SvnScmProviderRepository( url, user, password );

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/util/SvnUtil.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java?rev=389484&r1=389483&r2=389484&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.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/util/SvnUtil.java
Tue Mar 28 04:13:47 2006
@@ -49,9 +49,11 @@
             }
             catch ( FileNotFoundException e )
             {
+                //Nothing to do
             }
             catch ( IOException e )
             {
+                //Nothing to do
             }
             catch ( XmlPullParserException e )
             {



Mime
View raw message