From 5b499a8f4e4804d9c7da97f73ffff34acb76639b Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 31 Jul 2011 18:59:30 +0200
Subject: [PATCH] removed doExecute method

---
 .../sonia/scm/maven/AbstractBaseScmMojo.java  | 42 +------------------
 .../java/sonia/scm/maven/InstallMojo.java     |  2 +-
 .../main/java/sonia/scm/maven/RunMojo.java    |  4 +-
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java
index ab8a75f6ff..50676a9410 100644
--- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java
+++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/AbstractBaseScmMojo.java
@@ -80,41 +80,6 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   *
-   *
-   * @throws MojoExecutionException
-   * @throws MojoFailureException
-   */
-  protected abstract void doExecute()
-          throws MojoExecutionException, MojoFailureException;
-
-  /**
-   * Method description
-   *
-   *
-   * @throws MojoExecutionException
-   * @throws MojoFailureException
-   */
-  @Override
-  public void execute() throws MojoExecutionException, MojoFailureException
-  {
-    String home = project.getProperties().getProperty(PROPERTY_SCM_HOME);
-
-    if (home != null)
-    {
-      scmHomeDirectory = new File(home);
-    }
-    else
-    {
-      scmHomeDirectory = new File(scmHome);
-    }
-
-    doExecute();
-  }
-
   /**
    * Method description
    *
@@ -186,7 +151,7 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo
   protected void installArtifacts(List<String> excludeList)
           throws MojoExecutionException
   {
-    File pluginDirectory = new File(scmHomeDirectory, "plugins");
+    File pluginDirectory = new File(scmHome, "plugins");
 
     if (!pluginDirectory.exists() &&!pluginDirectory.mkdirs())
     {
@@ -416,9 +381,4 @@ public abstract class AbstractBaseScmMojo extends AbstractScmMojo
     c.setClasspathElements(classpath);
     JAXB.marshal(c, classpathFile);
   }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  protected File scmHomeDirectory;
 }
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java
index 1084530ecb..9e304a1d17 100644
--- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java
+++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/InstallMojo.java
@@ -62,7 +62,7 @@ public class InstallMojo extends AbstractBaseScmMojo
    * @throws MojoFailureException
    */
   @Override
-  public void doExecute() throws MojoExecutionException, MojoFailureException
+  public void execute() throws MojoExecutionException, MojoFailureException
   {
     File warFile = getWebApplicationArchive();
     List<String> excludeList = createExcludeList(warFile);
diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
index 14dff04d1a..a34f411c7a 100644
--- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
+++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
@@ -66,7 +66,7 @@ public class RunMojo extends AbstractBaseScmMojo
    * @throws MojoFailureException
    */
   @Override
-  public void doExecute() throws MojoExecutionException, MojoFailureException
+  public void execute() throws MojoExecutionException, MojoFailureException
   {
     File warFile = getWebApplicationArchive();
     List<String> excludeList = createExcludeList(warFile);
@@ -139,7 +139,7 @@ public class RunMojo extends AbstractBaseScmMojo
 
     try
     {
-      System.setProperty("scm.home", scmHomeDirectory.getAbsolutePath());
+      System.setProperty("scm.home", scmHome);
 
       Server server = new Server();
       SelectChannelConnector connector = new SelectChannelConnector();