continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r589673 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
Date Mon, 29 Oct 2007 15:26:20 GMT
Author: evenisse
Date: Mon Oct 29 08:26:19 2007
New Revision: 589673

URL: http://svn.apache.org/viewvc?rev=589673&view=rev
Log:
Don't add a new slash if the parent scm url already have a trailing slash. It will fix no
author/comment/date for some scm logs

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=589673&r1=589672&r2=589673&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
Mon Oct 29 08:26:19 2007
@@ -323,8 +323,18 @@
                         result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL,
urlString );
                         continue;
                     }
+
+                    String moduleScmUrl;
+                    if ( scmUrl.endsWith( "/" ) )
+                    {
+                        moduleScmUrl = scmUrl + module;
+                    }
+                    else
+                    {
+                        moduleScmUrl = scmUrl + "/" + module;
+                    }
                     // we are in recursive loading mode
-                    readModules( moduleUrl, result, false, username, password, scmUrl + "/"
+ module, true,
+                    readModules( moduleUrl, result, false, username, password, moduleScmUrl,
true,
                                  buildDefinitionTemplate );
                 }
             }



Mime
View raw message