Author: olamy
Date: Mon Jun 18 15:48:28 2012
New Revision: 1351394
URL: http://svn.apache.org/viewvc?rev=1351394&view=rev
Log:
[MTOMCAT-160] "Skipping non-war project" should not happen if using
<addContextWarDependencies>
fix logic.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
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=1351394&r1=1351393&r2=1351394&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
Mon Jun 18 15:48:28 2012
@@ -412,13 +412,13 @@ public abstract class AbstractRunMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- if ( skip && !addContextWarDependencies )
+ if ( skip )
{
getLog().info( "skip execution" );
return;
}
// ensure project is a web application
- if ( !isWar() )
+ if ( !isWar() && !addContextWarDependencies )
{
getLog().info( messagesProvider.getMessage(
"AbstractRunMojo.nonWar" ) );
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
