svn commit: r1635637 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/

[olamy]

Author: olamy
Date: Thu Oct 30 23:16:55 2014
New Revision: 1635637

URL: http://svn.apache.org/r1635637
Log:
[MTOMCAT-280] Allow running deploy-only and redeploy-only goals without pom file
Submitted by Dennis Lundberg

Modified:
    
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
    
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java

Modified: 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java?rev=1635637&r1=1635636&r2=1635637&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
 Thu Oct 30 23:16:55 2014
@@ -41,7 +41,7 @@ public class AbstractDeployWarMojo
     /**
      * The path of the WAR file to deploy.
      */
-    @Parameter( defaultValue = 
"${project.build.directory}/${project.build.finalName}.war", required = true )
+    @Parameter( defaultValue = 
"${project.build.directory}/${project.build.finalName}.war", property = 
"maven.tomcat.warFile", required = true )
     private File warFile;
 
     // ----------------------------------------------------------------------

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java?rev=1635637&r1=1635636&r2=1635637&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
 Thu Oct 30 23:16:55 2014
@@ -41,7 +41,7 @@ public class AbstractDeployWarMojo
     /**
      * The path of the WAR file to deploy.
      */
-    @Parameter( defaultValue = 
"${project.build.directory}/${project.build.finalName}.war", required = true )
+    @Parameter( defaultValue = 
"${project.build.directory}/${project.build.finalName}.war", property = 
"maven.tomcat.warFile", required = true )
     private File warFile;
 
     // ----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org