You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by oc...@apache.org on 2009/05/13 12:14:22 UTC
svn commit: r774276 - in /continuum/branches/continuum-flat-multi-module: ./
continuum-core/src/main/java/org/apache/maven/continuum/core/action/
continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/
Author: oching
Date: Wed May 13 10:14:22 2009
New Revision: 774276
URL: http://svn.apache.org/viewvc?rev=774276&view=rev
Log:
[CONTINUUM-1569]
o upgraded to maven-release-manager to 2.0-beta-10-SNAPSHOT
o more code cleanup
Modified:
continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java
continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
continuum/branches/continuum-flat-multi-module/pom.xml
Modified: continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java?rev=774276&r1=774275&r2=774276&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java Wed May 13 10:14:22 2009
@@ -23,7 +23,6 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
Modified: continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=774276&r1=774275&r2=774276&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Wed May 13 10:14:22 2009
@@ -156,19 +156,6 @@
}
mavenProject = builderHelper.getMavenProject( result, pomFile );
-
- if( !mavenProject.getModules().isEmpty() && checkoutInSingleDirectory )
- {
- String module = ( String ) mavenProject.getModules().get( 0 );
- StringUtils.replace( module, '/', '\\' );
-
- // confirm project is a flat multi-module project!
- if( module.indexOf( '\\' ) != 0 )
- {
- String modulePath = StringUtils.substring( module, module.lastIndexOf( '\\' ) + 1 );
- result.setModulePath( modulePath );
- }
- }
if ( result.hasErrors() )
{
@@ -346,28 +333,15 @@
String baseUrl = "";
for( int j = 1; j <= depth; j++ )
{
- if( scmUrl.endsWith( "/" ) )
- {
- String trimmedScmUrl = StringUtils.chompLast( new String( scmUrl ), "/" );
- baseUrl = StringUtils.substring( trimmedScmUrl, 0, trimmedScmUrl.lastIndexOf( '/' ) );
- }
- else
- {
- baseUrl = StringUtils.substring( scmUrl, 0, scmUrl.lastIndexOf( '/' ) );
- }
+ scmUrl = StringUtils.chompLast( new String( scmUrl ), "/" );
+ baseUrl = StringUtils.substring( scmUrl, 0, scmUrl.lastIndexOf( '/' ) );
}
moduleScmUrl = baseUrl + "/" + StringUtils.substring( modulePath, modulePath.lastIndexOf( '/' ) + 1 );
}
else
{
- if ( scmUrl.endsWith( "/" ) )
- {
- moduleScmUrl = scmUrl + module;
- }
- else
- {
- moduleScmUrl = scmUrl + "/" + module;
- }
+ scmUrl = StringUtils.chompLast( scmUrl, "/" );
+ moduleScmUrl = scmUrl + "/" + module;
}
// we are in recursive loading mode
readModules( moduleUrl, result, false, username, password, moduleScmUrl, true,
Modified: continuum/branches/continuum-flat-multi-module/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/pom.xml?rev=774276&r1=774275&r2=774276&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/pom.xml (original)
+++ continuum/branches/continuum-flat-multi-module/pom.xml Wed May 13 10:14:22 2009
@@ -496,7 +496,7 @@
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-manager</artifactId>
- <version>2.0-beta-9</version>
+ <version>2.0-beta-10-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>