Author: olamy
Date: Tue Jun 19 13:54:20 2012
New Revision: 1351715
URL: http://svn.apache.org/viewvc?rev=1351715&view=rev
Log:
manual skip win revert back logic to decide to run or not the tomcat instance
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.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=1351715&r1=1351714&r2=1351715&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
Tue Jun 19 13:54:20 2012
@@ -368,8 +368,8 @@ public abstract class AbstractRunMojo
protected boolean skip;
/**
- * @see {@link Webapp}
* @parameter
+ * @see {@link Webapp}
* @since 2.0
*/
private List<Webapp> additionalWebapps;
@@ -418,14 +418,13 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
-
- if ( skip && !addContextWarDependencies &&
getAdditionalWebapps().isEmpty() )
+ if ( skip )
{
getLog().info( "skip execution" );
return;
}
- // ensure project is a web application
- if ( !isWar() )
+ // ensure project is a web application and we have at least
additionnal webapps to run
+ if ( !isWar() && !addContextWarDependencies &&
getAdditionalWebapps().isEmpty() )
{
getLog().info( messagesProvider.getMessage(
"AbstractRunMojo.nonWar" ) );
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
