You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by oc...@apache.org on 2009/05/25 05:22:46 UTC
svn commit: r778269 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
Author: oching
Date: Mon May 25 03:22:45 2009
New Revision: 778269
URL: http://svn.apache.org/viewvc?rev=778269&view=rev
Log:
[MRELEASE-261]/[MRELEASE-322]/[MRELEASE-225]/[MRELEASE-336]
o fixed common path determination (this was failing in windows)
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java?rev=778269&r1=778268&r2=778269&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java Mon May 25 03:22:45 2009
@@ -253,25 +253,20 @@
// module is a flat multi-module project
if( getLongestPathCount( project.getModules() ) > 0 )
{
- String projectBaseDir = project.getBasedir().getPath();
- if( ReleaseUtil.FS.equals( "\\" ) )
- {
- projectBaseDir = StringUtils.replace( projectBaseDir, "/", "\\" );
- }
- else
- {
- projectBaseDir = StringUtils.replace( projectBaseDir, "\\", "/" );
- }
+ String projectBaseDir = project.getBasedir().getPath();
+ projectBaseDir = StringUtils.replace( projectBaseDir, "\\", "/" );
String projectPath = "";
if( project.getScm() != null )
{
+ String scmConnection = project.getScm().getConnection();
+ scmConnection = StringUtils.replace( scmConnection, "\\", "/" );
+
projectPath =
- ReleaseUtil.getCommonPath( StringUtils.reverse( StringUtils.chomp( projectBaseDir, ReleaseUtil.FS ) ),
- StringUtils.reverse( StringUtils.chomp( project.getScm().getConnection(), "/" ) ) );
+ ReleaseUtil.getCommonPath( StringUtils.reverse( StringUtils.chomp( projectBaseDir, "/" ) ),
+ StringUtils.reverse( StringUtils.chomp( scmConnection, "/" ) ) );
}
-
relPath = StringUtils.reverse( projectPath );
}