svn commit: r1083348 - in /maven/release/trunk: ./ maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/

[olamy]

Author: olamy
Date: Sun Mar 20 00:09:57 2011
New Revision: 1083348

URL: http://svn.apache.org/viewvc?rev=1083348&view=rev
Log:
debug for equals on file with symlink

Modified:
    maven/release/trunk/.gitignore
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
    
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java

Modified: maven/release/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/.gitignore?rev=1083348&r1=1083347&r2=1083348&view=diff
==============================================================================
--- maven/release/trunk/.gitignore (original)
+++ maven/release/trunk/.gitignore Sun Mar 20 00:09:57 2011
@@ -2,6 +2,7 @@
 atlassian-ide-plugin.xml
 *.iml
 *.iws
+.idea
 target
 .classpath
 .project

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=1083348&r1=1083347&r2=1083348&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
 Sun Mar 20 00:09:57 2011
@@ -167,8 +167,7 @@ public class CheckoutProjectFromScm
             String rootProjectBasedir = 
rootProject.getBasedir().getAbsolutePath();
             try
             {
-                // take care about symlink
-                if ( !rootProject.getBasedir().getAbsolutePath().equals( 
rootProject.getBasedir().getCanonicalPath() ) )
+                if ( ReleaseUtil.isSymlink( rootProject.getBasedir() ) )
                 {
                     rootProjectBasedir = 
rootProject.getBasedir().getCanonicalPath();
                 }

Modified: 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java?rev=1083348&r1=1083347&r2=1083348&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
 Sun Mar 20 00:09:57 2011
@@ -41,9 +41,11 @@ public class IsScmFileSetEquals
     public boolean eval( Object object )
     {
         ScmFileSet fs = (ScmFileSet) object;
-
+        
         System.out.println( "fs.getBasedir " + fs.getBasedir() );
         System.out.println( "fileSet.getBasedir " + fs.getBasedir() );
+        System.out.println( "equals " + fs.getBasedir().equals( 
fileSet.getBasedir() ) );
+        
         
         return fs.getBasedir().equals( fileSet.getBasedir() ) &&
          fs.getFileList().equals( fileSet.getFileList() );