You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm-commits@maven.apache.org by ev...@apache.org on 2005/10/19 18:00:37 UTC

svn commit: r326591 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java

Author: evenisse
Date: Wed Oct 19 09:00:19 2005
New Revision: 326591

URL: http://svn.apache.org/viewcvs?rev=326591&view=rev
Log:
[SCM-58] Don't ignore working directory

Modified:
    maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=326591&r1=326590&r2=326591&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java (original)
+++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java Wed Oct 19 09:00:19 2005
@@ -46,8 +46,7 @@
     /**
      * The working directory
      * 
-     * @parameter expression="${basedir}"
-     * @required
+     * @parameter expression="${workingDirectory}"
      */
     private File workingDirectory;
 
@@ -91,6 +90,14 @@
      */
     private ScmManager manager;
 
+    /**
+     * The base directory
+     * 
+     * @parameter expression="${basedir}"
+     * @required
+     */
+    private File basedir;
+
     public String getConnectionUrl()
     {
         if ( connectionUrl == null )
@@ -102,6 +109,11 @@
 
     public File getWorkingDirectory()
     {
+        if ( workingDirectory == null )
+        {
+            return basedir;
+        }
+
         return workingDirectory;
     }