removed doExecute method

This commit is contained in:
Sebastian Sdorra
2011-07-31 18:59:30 +02:00
parent 4e98f6138e
commit 5b499a8f4e
3 changed files with 4 additions and 44 deletions

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -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();