You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2013/01/09 21:39:27 UTC
svn commit: r1431047 - 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/
tomcat7-maven-plugin/src/main/java/org/ap...
Author: olamy
Date: Wed Jan 9 20:39:26 2013
New Revision: 1431047
URL: http://svn.apache.org/viewvc?rev=1431047&view=rev
Log:
[MTOMCAT-199] Text cleanup of goal definitions
Submitted by Glen Mazza
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployOnlyMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarOnlyMojo.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/deploy/DeployOnlyMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarOnlyMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarOnlyMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ShutdownMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.java
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployOnlyMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployOnlyMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployOnlyMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployOnlyMojo.java Wed Jan 9 20:39:26 2013
@@ -22,7 +22,7 @@ package org.apache.tomcat.maven.plugin.t
import org.apache.maven.plugins.annotations.Mojo;
/**
- * Deploy a WAR to Tomcat without forking the package lifecycle
+ * Deploy a WAR to Tomcat without forking the package lifecycle.
*
* @author olamy
* @since 1.0-alpha-2
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployMojo.java Wed Jan 9 20:39:26 2013
@@ -24,7 +24,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
/**
- * Redeploy a WAR in Tomcat. Deploy with forcing update flag to true
+ * Redeploy a WAR in Tomcat. (Alias for the deploy goal with its update parameter set to true.)
*
* @author Mark Hobson <ma...@gmail.com>
* @todo depend on war:war, war:exploded or war:inplace when MNG-1649 resolved
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RedeployOnlyMojo.java Wed Jan 9 20:39:26 2013
@@ -23,6 +23,9 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
/**
+ * Redeploy a WAR in Tomcat without forking the package lifecycle.
+ * (Alias for the deploy-only goal with its update parameter set to true.)
+ *
* @since 2.1
*/
@Mojo( name = "redeploy-only" )
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarOnlyMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarOnlyMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarOnlyMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarOnlyMojo.java Wed Jan 9 20:39:26 2013
@@ -24,7 +24,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.ResolutionScope;
/**
- * Runs the current project as a packaged web application using an embedded Tomcat server without forking the package cycle.
+ * Same as run-war goal without forking the package cycle.
*
* @author vlatombe
*/
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=1431047&r1=1431046&r2=1431047&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 Jan 9 20:39:26 2013
@@ -28,7 +28,7 @@ import org.apache.tomcat.maven.common.ru
/**
* <p>
- * Shuts down all possibly started embedded tomcat servers. This will be automatically down
+ * Shuts down all possibly started embedded Tomcat servers. This will be automatically done
* through a shutdown hook or you may call this Mojo to shut them down explictly.
* </p>
* <p>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployOnlyMojo.java Wed Jan 9 20:39:26 2013
@@ -22,7 +22,7 @@ package org.apache.tomcat.maven.plugin.t
import org.apache.maven.plugins.annotations.Mojo;
/**
- * Deploy a WAR to Tomcat without forking the package lifecycle
+ * Deploy a WAR to Tomcat without forking the package lifecycle.
*
* @author olamy
* @since 1.0-alpha-2
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployMojo.java Wed Jan 9 20:39:26 2013
@@ -24,7 +24,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
/**
- * Redeploy a WAR in Tomcat. Deploy with forcing update flag to true
+ * Redeploy a WAR in Tomcat. (Alias for the deploy goal with its update parameter set to true.)
*
* @author Olivier Lamy
* @since 2.1
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/RedeployOnlyMojo.java Wed Jan 9 20:39:26 2013
@@ -22,7 +22,8 @@ package org.apache.tomcat.maven.plugin.t
import org.apache.maven.plugins.annotations.Mojo;
/**
- * Redeploy a WAR in Tomcat. Deploy with forcing update flag to true
+ * Redeploy a WAR in Tomcat without forking the package lifecycle.
+ * (Alias for the deploy-only goal with its update parameter set to true.)
*
* @since 2.1
*/
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarMojo.java Wed Jan 9 20:39:26 2013
@@ -23,10 +23,10 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
/**
- * <p>This mojo will create a self executable jar file containing all tomcat classes.</p>
- * <p>So you will be able to use only: java -jar createjar.jar to run your webapp without need
- * to install an Apache Tomcat instance.</p>
- * <p>More details here: <a href="http://tomcat.apache.org/maven-plugin-2.0-beta-1/executable-war-jar.html">http://tomcat.apache.org/maven-plugin-2.0-beta-1/executable-war-jar.html</a></p>
+ * Create a self executable jar file containing all necessary Apache Tomcat classes.
+ * This allows for using just <code>java -jar mywebapp.jar</code> to run your webapp without
+ * needing to install a Tomcat instance.
+ * More details <a href="http://tomcat.apache.org/maven-plugin-2.0-beta-1/executable-war-jar.html">here</a>.
*
* @author Olivier Lamy
* @since 2.0
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarOnlyMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarOnlyMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarOnlyMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExecWarOnlyMojo.java Wed Jan 9 20:39:26 2013
@@ -21,6 +21,8 @@ package org.apache.tomcat.maven.plugin.t
import org.apache.maven.plugins.annotations.Mojo;
/**
+ * Same as exec-war goal without forking the package lifecycle.
+ *
* @author Olivier Lamy
* @since 2.0
*/
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarOnlyMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarOnlyMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarOnlyMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarOnlyMojo.java Wed Jan 9 20:39:26 2013
@@ -24,7 +24,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.ResolutionScope;
/**
- * Runs the current project as a packaged web application using an embedded Tomcat server without forking the package cycle.
+ * Same as run-war goal without forking the package cycle.
*
* @author vlatombe
*/
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=1431047&r1=1431046&r2=1431047&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 Jan 9 20:39:26 2013
@@ -29,7 +29,7 @@ import org.apache.tomcat.maven.plugin.to
/**
* <p>
- * Shuts down all possibly started embedded tomcat servers. This will be automatically down
+ * Shuts down all possibly started embedded Tomcat servers. This will be automatically done
* through a shutdown hook or you may call this Mojo to shut them down explictly.
* </p>
* <p>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.java?rev=1431047&r1=1431046&r2=1431047&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarMojo.java Wed Jan 9 20:39:26 2013
@@ -23,7 +23,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
/**
- * This Mojo will create an executable war file with embedded tomcat that is also capable of being deployed elsewhere
+ * This Mojo will create an executable war file with embedded Tomcat that is also capable of being deployed elsewhere.
*
* @since 2.1
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org