You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2008/01/06 18:21:25 UTC

svn commit: r609349 - /maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java

Author: dennisl
Date: Sun Jan  6 09:21:24 2008
New Revision: 609349

URL: http://svn.apache.org/viewvc?rev=609349&view=rev
Log:
[MANT-34] The generated maven-build.xml and maven-build.properties contains absolute path to local repository

Modified:
    maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java

Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=609349&r1=609348&r2=609349&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java Sun Jan  6 09:21:24 2008
@@ -204,7 +204,7 @@
 
         addProperty( properties, "maven.settings.offline", String.valueOf( settings.isOffline() ) );
         addProperty( properties, "maven.settings.interactiveMode", String.valueOf( settings.isInteractiveMode() ) );
-        addProperty( properties, "maven.repo.local", localRepository.getAbsolutePath() );
+        addProperty( properties, "maven.repo.local", getLocalRepositoryPath() );
 
         // ----------------------------------------------------------------------
         // Project properties
@@ -500,7 +500,7 @@
 
         writer.startElement( "property" );
         writer.addAttribute( "name", "maven.repo.local" );
-        writer.addAttribute( "value", localRepository.getAbsolutePath() );
+        writer.addAttribute( "value", getLocalRepositoryPath() );
         writer.endElement(); // property
 
         writer.startElement( "property" );
@@ -514,6 +514,26 @@
         writer.endElement(); // property
 
         AntBuildWriterUtil.writeLineBreak( writer );
+    }
+
+    /**
+     * Check if the local repository is in the default location:
+     * <code>${user.home}/.m2/repository</code>. If that is the case then return
+     * the path with the system property "user.home" in it. If not then just
+     * return the absolute path to the local repository.
+     */
+    private String getLocalRepositoryPath() {
+        String userHome = System.getProperty( "user.home" );
+        String defaultPath = ( userHome + "/.m2/repository" ).replace( '\\', '/' );
+        String actualPath = localRepository.getAbsolutePath().replace( '\\', '/' );
+        if( actualPath.equals( defaultPath ) )
+        {
+            return "${user.home}/.m2/repository";
+        }
+        else
+        {
+            return localRepository.getAbsolutePath();
+        }
     }
 
     /**