Author: olamy
Date: Wed Feb 29 21:30:20 2012
New Revision: 1295290
URL: http://svn.apache.org/viewvc?rev=1295290&view=rev
Log:
[MTOMCAT-120] Support "skip" parameter.
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1295290&r1=1295289&r2=1295290&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Wed Feb 29 21:30:20 2012
@@ -315,6 +315,15 @@ public abstract class AbstractRunMojo
*/
private File managerWarPath;
+
+ /**
+ * Skip execution
+ *
+ * @parameter expression="${maven.tomcat.skip}" default-value="false"
+ * @since 2.0
+ */
+ protected boolean skip;
+
// ----------------------------------------------------------------------
// Fields
// ----------------------------------------------------------------------
@@ -334,6 +343,11 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
+ if ( skip )
+ {
+ getLog().info( "skip execution" );
+ return;
+ }
// ensure project is a web application
if ( !isWar() )
{
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java?rev=1295290&r1=1295289&r2=1295290&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
Wed Feb 29 21:30:20 2012
@@ -51,6 +51,14 @@ public class ShutdownMojo
protected boolean skipErrorOnShutdown;
/**
+ * Skip execution
+ *
+ * @parameter expression="${maven.tomcat.skipShutdown}"
default-value="false"
+ * @since 2.0
+ */
+ protected boolean skip;
+
+ /**
* Shuts down all embedded tomcats which got started up to now.
*
* @throws MojoExecutionException if shutting down one or all servers
failed
@@ -58,6 +66,11 @@ public class ShutdownMojo
public void execute()
throws MojoExecutionException
{
+ if ( skip )
+ {
+ getLog().info( "skip execution" );
+ return;
+ }
try
{
EmbeddedRegistry.getInstance().shutdownAll( getLog() );
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1295290&r1=1295289&r2=1295290&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Wed Feb 29 21:30:20 2012
@@ -314,6 +314,14 @@ public abstract class AbstractRunMojo
*/
private File tomcatLoggingFile;
+ /**
+ * Skip execution
+ *
+ * @parameter expression="${maven.tomcat.skip}" default-value="false"
+ * @since 2.0
+ */
+ protected boolean skip;
+
// ----------------------------------------------------------------------
// Fields
@@ -334,6 +342,11 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
+ if ( skip )
+ {
+ getLog().info( "skip execution" );
+ return;
+ }
// ensure project is a web application
if ( !isWar() )
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java?rev=1295290&r1=1295289&r2=1295290&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
Wed Feb 29 21:30:20 2012
@@ -42,6 +42,23 @@ import org.apache.tomcat.maven.plugin.to
public class ShutdownMojo
extends AbstractTomcat7Mojo
{
+
+ /**
+ * Ignore error when shutdown
+ *
+ * @parameter expression="${maven.tomcat.skipErrorOnShutdown}"
default-value="false"
+ * @since 2.0
+ */
+ protected boolean skipErrorOnShutdown;
+
+ /**
+ * Skip execution
+ *
+ * @parameter expression="${maven.tomcat.skipShutdown}"
default-value="false"
+ * @since 2.0
+ */
+ protected boolean skip;
+
/**
* Shuts down all embedded tomcats which got started up to now.
*
@@ -51,13 +68,21 @@ public class ShutdownMojo
public void execute()
throws MojoExecutionException
{
+ if ( skip )
+ {
+ getLog().info( "skip execution" );
+ return;
+ }
try
{
EmbeddedRegistry.getInstance().shutdownAll( getLog() );
}
catch ( Exception e )
{
- throw new MojoExecutionException( messagesProvider.getMessage(
"ShutdownMojo.shutdownError" ), e );
+ if ( !skipErrorOnShutdown )
+ {
+ throw new MojoExecutionException( messagesProvider.getMessage(
"ShutdownMojo.shutdownError" ), e );
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
