Author: olamy
Date: Tue Jul 31 16:01:40 2012
New Revision: 1367641
URL: http://svn.apache.org/viewvc?rev=1367641&view=rev
Log:
[MTOMCAT-157] use new Maven Plugins annotations. done for tomcat7 mojos.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractWarCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.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/run/AbstractExecWarMojo.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/AbstractRunWarMojo.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/RunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarMojo.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
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
Tue Jul 31 16:01:40 2012
@@ -21,6 +21,8 @@ package org.apache.tomcat.maven.plugin.t
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.tomcat.maven.common.deployer.TomcatManager;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
@@ -64,58 +66,46 @@ public abstract class AbstractCatalinaMo
/**
* The Maven Wagon manager to use when obtaining server authentication
details.
- *
- * @component role="org.apache.maven.artifact.manager.WagonManager"
- * @required
- * @readonly
*/
+ @Component
private WagonManager wagonManager;
/**
* The full URL of the Tomcat manager instance to use.
- *
- * @parameter expression="${maven.tomcat.url}"
default-value="http://localhost:8080/manager/html";
- * @required
*/
+ @Parameter( property = "maven.tomcat.url", defaultValue =
"http://localhost:8080/manager/html";, required = true )
private URL url;
/**
* The server id in settings.xml to use when authenticating with Tomcat
manager, or <code>null</code> to use
* defaults of username <code>admin</code> and no password.
- *
- * @parameter expression="${maven.tomcat.server}"
*/
+ @Parameter( property = "maven.tomcat.server" )
private String server;
/**
* The URL encoding charset to use when communicating with Tomcat manager.
- *
- * @parameter expression="${maven.tomcat.charset}"
default-value="ISO-8859-1"
- * @required
*/
+ @Parameter( property = "maven.tomcat.charset", defaultValue =
"ISO-8859-1", required = true )
private String charset;
/**
* The tomcat username to use for deployment
*
- * @parameter expression="${tomcat.username}"
* @since 1.0-alpha-2
*/
+ @Parameter( property = "tomcat.username" )
private String username;
/**
* The password to use for deployment
*
- * @parameter expression="${tomcat.password}"
* @since 1.0-alpha-2
*/
+ @Parameter( property = "tomcat.password" )
private String password;
- /**
- * @parameter expression="${plugin.version}"
- * @required
- * @readonly
- */
+ @Parameter( defaultValue = "${plugin.version}", required = true, readonly
= true )
private String version;
// ----------------------------------------------------------------------
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
Tue Jul 31 16:01:40 2012
@@ -19,6 +19,8 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.tomcat.maven.common.messages.MessagesProvider;
/**
@@ -28,9 +30,7 @@ import org.apache.tomcat.maven.common.me
public abstract class AbstractTomcat7Mojo
extends AbstractMojo
{
- /**
- * @component
- */
+ @Component
protected MessagesProvider messagesProvider;
// ----------------------------------------------------------------------
@@ -40,10 +40,8 @@ public abstract class AbstractTomcat7Moj
/**
* The webapp context path to use for the web application being run. This
must always start with a forward-slash
* ('/').
- *
- * @parameter expression="${maven.tomcat.path}"
default-value="/${project.artifactId}"
- * @required
*/
+ @Parameter( defaultValue = "/${project.artifactId}", property =
"maven.tomcat.path", required = true )
protected String path;
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractWarCatalinaMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractWarCatalinaMojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractWarCatalinaMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractWarCatalinaMojo.java
Tue Jul 31 16:01:40 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* Abstract goal that provides common configuration for Catalina-based goals.
@@ -35,19 +36,16 @@ public abstract class AbstractWarCatalin
/**
* The packaging of the Maven project that this goal operates upon.
- *
- * @parameter expression = "${project.packaging}"
- * @required
- * @readonly
*/
+ @Parameter( defaultValue = "${project.packaging}", required = true,
readonly = true )
private String packaging;
/**
* If set to true ignore if packaging of project is not 'war'.
*
- * @parameter expression="${tomcat.ignorePackaging}" default-value="false"
* @since 1.1
*/
+ @Parameter( property = "tomcat.ignorePackaging", defaultValue = "false" )
private boolean ignorePackaging;
// ----------------------------------------------------------------------
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
Tue Jul 31 16:01:40 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import org.apache.tomcat.maven.plugin.tomcat7.AbstractWarCatalinaMojo;
@@ -42,32 +43,26 @@ public abstract class AbstractDeployMojo
/**
* The deployment mode to use. This must be either <code>war</code> to
deploy the war, <code>context</code> to
* deploy the context XML file, or <code>both</code> to deploy the war
with the context XML file.
- *
- * @parameter expression = "${maven.tomcat.mode}" default-value = "war"
- * @required
*/
+ @Parameter( property = "maven.tomcat.mode", defaultValue = "war", required
= true )
private String mode;
/**
* The path of the Tomcat context XML file. This is not used for war
deployment mode.
- *
- * @parameter expression =
"${project.build.directory}/${project.build.finalName}/META-INF/context.xml"
*/
+ @Parameter( defaultValue =
"${project.build.directory}/${project.build.finalName}/META-INF/context.xml" )
private File contextFile;
/**
* Whether Tomcat should automatically undeploy webapps that already exist
when deploying.
- *
- * @parameter expression = "${maven.tomcat.update}" default-value = "false"
- * @required
*/
+ @Parameter( property = "maven.tomcat.update", defaultValue = "false",
required = true )
private boolean update;
/**
* The Tomcat webapp tag name to use.
- *
- * @parameter expression = "${maven.tomcat.tag}"
*/
+ @Parameter( property = "maven.tomcat.tag" )
private String tag;
// ----------------------------------------------------------------------
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=1367641&r1=1367640&r2=1367641&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
Tue Jul 31 16:01:40 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse;
@@ -39,10 +40,8 @@ public class AbstractDeployWarMojo
/**
* The path of the WAR file to deploy.
- *
- * @parameter expression =
"${project.build.directory}/${project.build.finalName}.war"
- * @required
*/
+ @Parameter( defaultValue =
"${project.build.directory}/${project.build.finalName}.war", required = true )
private File warFile;
// ----------------------------------------------------------------------
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java
Tue Jul 31 16:01:40 2012
@@ -19,13 +19,17 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+
/**
* Deploy a WAR to Tomcat.
*
* @author Mark Hobson <[email protected]>
- * @goal deploy
- * @execute phase="package"
*/
+@Mojo( name = "deploy" )
+@Execute( phase = LifecyclePhase.PACKAGE )
public class DeployMojo
extends AbstractDeployWarMojo
{
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=1367641&r1=1367640&r2=1367641&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
Tue Jul 31 16:01:40 2012
@@ -19,13 +19,15 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.plugins.annotations.Mojo;
+
/**
* Deploy a WAR to Tomcat without forking the package lifecycle
*
* @author olamy
- * @goal deploy-only
* @since 1.0-alpha-2
*/
+@Mojo( name = "deploy-only" )
public class DeployOnlyMojo
extends AbstractDeployWarMojo
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Tue Jul 31 16:01:40 2012
@@ -34,6 +34,8 @@ import org.apache.maven.artifact.resolve
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo;
@@ -65,181 +67,133 @@ import java.util.jar.JarFile;
public abstract class AbstractExecWarMojo
extends AbstractTomcat7Mojo
{
- /**
- * @parameter default-value="${project.artifact}"
- * @required
- * @readonly
- */
+
+ @Parameter( defaultValue = "${project.artifact}", required = true,
readonly = true )
private Artifact projectArtifact;
/**
* The maven project.
- *
- * @parameter default-value="${project}"
- * @required
- * @readonly
*/
+ @Parameter( defaultValue = "${project}", required = true, readonly = true )
protected MavenProject project;
- /**
- * @parameter default-value="${plugin.artifacts}"
- * @required
- */
+ @Parameter( defaultValue = "${plugin.artifacts}", required = true )
private List<Artifact> pluginArtifacts;
- /**
- * @parameter default-value="${project.build.directory}"
- */
+ @Parameter( defaultValue = "${project.build.directory}" )
private File buildDirectory;
/**
* Path under {@link #buildDirectory} where this mojo may do temporary
work.
- *
- * @parameter
default-value="${project.build.directory}/tomcat7-maven-plugin-exec"
- * @since 2.0
*/
+ @Parameter( defaultValue =
"${project.build.directory}/tomcat7-maven-plugin-exec" )
private File pluginWorkDirectory;
- /**
- * @parameter default-value="src/main/tomcatconf"
expression="${maven.tomcat.exec.war.tomcatConf}"
- */
+ @Parameter( property = "maven.tomcat.exec.war.tomcatConf", defaultValue =
"src/main/tomcatconf" )
private File tomcatConfigurationFilesDirectory;
- /**
- * @parameter default-value="src/main/tomcatconf/server.xml"
expression="${maven.tomcat.exec.war.serverXml}"
- */
+ @Parameter( defaultValue = "src/main/tomcatconf/server.xml", property =
"maven.tomcat.exec.war.serverXml" )
private File serverXml;
/**
* Name of the generated exec JAR.
- *
- * @parameter expression="${tomcat.jar.finalName}"
default-value="${project.artifactId}-${project.version}-war-exec.jar"
- * @required
*/
+ @Parameter( property = "tomcat.jar.finalName",
+ defaultValue =
"${project.artifactId}-${project.version}-war-exec.jar", required = true )
private String finalName;
/**
* The webapp context path to use for the web application being run.
* The name to store webapp in exec jar. Do not use /
- *
- * @parameter expression="${maven.tomcat.path}"
default-value="${project.artifactId}"
- * @required
*/
+ @Parameter( property = "maven.tomcat.path", defaultValue =
"${project.artifactId}", required = true )
protected String path;
- /**
- * @parameter
- */
+ @Parameter
protected List<WarRunDependency> warRunDependencies;
- /**
- * @component
- */
+ @Component
protected ArtifactResolver artifactResolver;
/**
* Maven Artifact Factory component.
- *
- * @component
*/
+ @Component
private ArtifactFactory artifactFactory;
/**
* Location of the local repository.
- *
- * @parameter expression="${localRepository}"
- * @readonly
- * @required
*/
+ @Parameter( defaultValue = "${localRepository}", required = true, readonly
= true )
private ArtifactRepository local;
/**
* List of Remote Repositories used by the resolver
- *
- * @parameter expression="${project.remoteArtifactRepositories}"
- * @readonly
- * @required
*/
+ @Parameter( defaultValue = "${project.remoteArtifactRepositories}",
required = true, readonly = true )
protected List<ArtifactRepository> remoteRepos;
- /**
- * @component
- * @required
- * @readonly
- */
+ @Component
private MavenProjectHelper projectHelper;
/**
* Attach or not the generated artifact to the build (use true if you want
to install or deploy it)
- *
- * @parameter expression="${maven.tomcat.exec.war.attachArtifact}"
default-value="true"
- * @required
*/
+ @Parameter( property = "maven.tomcat.exec.war.attachArtifact",
defaultValue = "true", required = true )
private boolean attachArtifact;
/**
* the classifier to use for the attached/generated artifact
- *
- * @parameter
expression="${maven.tomcat.exec.war.attachArtifactClassifier}"
default-value="exec-war"
- * @required
*/
+ @Parameter( property = "maven.tomcat.exec.war.attachArtifactClassifier",
defaultValue = "exec-war",
+ required = true )
private String attachArtifactClassifier;
/**
* the type to use for the attached/generated artifact
- *
- * @parameter expression="${maven.tomcat.exec.war.attachArtifactType}"
default-value="jar"
- * @required
*/
+ @Parameter( property = "maven.tomcat.exec.war.attachArtifactType",
defaultValue = "jar", required = true )
private String attachArtifactClassifierType;
/**
* to enable naming when starting tomcat
- *
- * @parameter expression="${maven.tomcat.exec.war.enableNaming}"
default-value="false"
- * @required
*/
+ @Parameter( property = "maven.tomcat.exec.war.enableNaming", defaultValue
= "false", required = true )
private boolean enableNaming;
/**
* see http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html
- *
- * @parameter expression="${maven.tomcat.exec.war.accessLogValveFormat}"
default-value="%h %l %u %t "%r" %s %b %I %D"
- * @required
*/
+ @Parameter( property = "maven.tomcat.exec.war.accessLogValveFormat",
defaultValue = "%h %l %u %t %r %s %b %I %D",
+ required = true )
private String accessLogValveFormat;
/**
* list of extra dependencies to add in the standalone tomcat jar: your
jdbc driver, mail.jar etc..
* <b>Those dependencies will be in root classloader.</b>
- *
- * @parameter
*/
+ @Parameter
private List<ExtraDependency> extraDependencies;
/**
* list of extra resources to add in the standalone tomcat jar: your
logger configuration etc
- *
- * @parameter
*/
+ @Parameter
private List<ExtraResource> extraResources;
/**
* Main class to use for starting the standalone jar.
- *
- * @parameter expression="${maven.tomcat.exec.war.mainClass}"
default-value="org.apache.tomcat.maven.runner.Tomcat7RunnerCli"
- * @required
*/
+ @Parameter( property = "maven.tomcat.exec.war.mainClass",
+ defaultValue =
"org.apache.tomcat.maven.runner.Tomcat7RunnerCli", required = true )
private String mainClass;
/**
* which connector protocol to use HTTP/1.1 or
org.apache.coyote.http11.Http11NioProtocol
- *
- * @parameter expression="${maven.tomcat.exec.war.connectorHttpProtocol}"
default-value="HTTP/1.1"
- * @required
*/
+ @Parameter( property = "maven.tomcat.exec.war.connectorHttpProtocol",
defaultValue = "HTTP/1.1", required = true )
private String connectorHttpProtocol;
public void execute()
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=1367641&r1=1367640&r2=1367641&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
Tue Jul 31 16:01:40 2012
@@ -34,14 +34,18 @@ import org.apache.catalina.valves.Access
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.naming.NamingEntry;
import org.apache.naming.resources.FileDirContext;
@@ -101,26 +105,21 @@ public abstract class AbstractRunMojo
/**
* Used to look up Artifacts in the remote repository.
- *
- * @component
*/
- protected org.apache.maven.artifact.factory.ArtifactFactory factory;
+ @Component
+ protected ArtifactFactory factory;
/**
* Location of the local repository.
- *
- * @parameter expression="${localRepository}"
- * @readonly
- * @required
*/
+ @Parameter( defaultValue = "${localRepository}", required = true, readonly
= true )
private org.apache.maven.artifact.repository.ArtifactRepository local;
/**
* Used to look up Artifacts in the remote repository.
- *
- * @component
*/
- protected org.apache.maven.artifact.resolver.ArtifactResolver resolver;
+ @Component
+ protected ArtifactResolver resolver;
// ----------------------------------------------------------------------
// Mojo Parameters
@@ -128,26 +127,21 @@ public abstract class AbstractRunMojo
/**
* The packaging of the Maven project that this goal operates upon.
- *
- * @parameter expression = "${project.packaging}"
- * @required
- * @readonly
*/
+ @Parameter( defaultValue = "${project.packaging}", required = true,
readonly = true )
private String packaging;
/**
* The directory to create the Tomcat server configuration under.
- *
- * @parameter expression="${project.build.directory}/tomcat"
*/
+ @Parameter( defaultValue = "${project.build.directory}/tomcat" )
private File configurationDir;
/**
* The port to run the Tomcat server on.
* Will be exposed as System props and session.executionProperties with
key tomcat.maven.http.port
- *
- * @parameter expression="${maven.tomcat.port}" default-value="8080"
*/
+ @Parameter( property = "maven.tomcat.port", defaultValue = "8080" )
private int port;
/**
@@ -156,9 +150,9 @@ public abstract class AbstractRunMojo
* The ajp connector will be started only for value > 0.
* Will be exposed as System props and session.executionProperties with
key tomcat.maven.ajp.port
*
- * @parameter expression="${maven.tomcat.ajp.port}" default-value="0"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.ajp.port", defaultValue = "0" )
private int ajpPort;
/**
@@ -171,9 +165,9 @@ public abstract class AbstractRunMojo
* <li>org.apache.coyote.ajp.AjpAprProtocol - the APR/native
connector.</li>
* </ul>
*
- * @parameter expression="${maven.tomcat.ajp.protocol}"
default-value="org.apache.coyote.ajp.AjpProtocol"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.ajp.protocol", defaultValue =
"org.apache.coyote.ajp.AjpProtocol" )
private String ajpProtocol;
/**
@@ -182,58 +176,58 @@ public abstract class AbstractRunMojo
* The https connector will be started only for value > 0.
* Will be exposed as System props and session.executionProperties with
key tomcat.maven.https.port
*
- * @parameter expression="${maven.tomcat.httpsPort}" default-value="0"
* @since 1.0
*/
+ @Parameter( property = "maven.tomcat.httpsPort", defaultValue = "0" )
private int httpsPort;
/**
* The character encoding to use for decoding URIs.
*
- * @parameter expression="${maven.tomcat.uriEncoding}"
default-value="ISO-8859-1"
* @since 1.0
*/
+ @Parameter( property = "maven.tomcat.uriEncoding", defaultValue =
"ISO-8859-1" )
private String uriEncoding;
/**
* List of System properties to pass to the Tomcat Server.
*
- * @parameter
* @since 1.0-alpha-2
*/
+ @Parameter
private Map<String, String> systemProperties;
/**
* The directory contains additional configuration Files that copied in
the Tomcat conf Directory.
*
- * @parameter expression = "${maven.tomcat.additionalConfigFilesDir}"
default-value="${basedir}/src/main/tomcatconf"
* @since 1.0-alpha-2
*/
+ @Parameter( property = "maven.tomcat.additionalConfigFilesDir",
defaultValue = "${basedir}/src/main/tomcatconf" )
private File additionalConfigFilesDir;
/**
* server.xml to use <b>Note if you use this you must configure in this
file your webapp paths</b>.
*
- * @parameter expression="${maven.tomcat.serverXml}"
* @since 1.0-alpha-2
*/
+ @Parameter( property = "maven.tomcat.serverXml" )
private File serverXml;
/**
* overriding the providing web.xml to run tomcat
*
- * @parameter expression="${maven.tomcat.webXml}"
* @since 1.0-alpha-2
*/
+ @Parameter( property = "maven.tomcat.webXml" )
private File tomcatWebXml;
/**
* Set this to true to allow Maven to continue to execute after invoking
* the run goal.
*
- * @parameter expression="${maven.tomcat.fork}" default-value="false"
* @since 1.0
*/
+ @Parameter( property = "maven.tomcat.fork", defaultValue = "false" )
private boolean fork;
/**
@@ -245,76 +239,72 @@ public abstract class AbstractRunMojo
* </pre>
* To preserve backward compatibility it's false by default.
*
- * @parameter expression="${maven.tomcat.addContextWarDependencies}"
default-value="false"
* @since 1.0
* @deprecated use webapps instead
*/
+ @Parameter( property = "maven.tomcat.addContextWarDependencies",
defaultValue = "false" )
private boolean addContextWarDependencies;
/**
* The maven project.
*
- * @parameter expression="${project}"
- * @required
- * @readonly
* @since 1.0
*/
+ @Component
protected MavenProject project;
/**
* The archive manager.
*
- * @component
* @since 1.0
*/
+ @Component
private ArchiverManager archiverManager;
/**
* if <code>true</code> a new classLoader separated from maven core will
be created to start tomcat.
*
- * @parameter expression="${tomcat.useSeparateTomcatClassLoader}"
default-value="false"
* @since 1.0
*/
+ @Parameter( property = "tomcat.useSeparateTomcatClassLoader", defaultValue
= "false" )
protected boolean useSeparateTomcatClassLoader;
/**
- * @parameter expression="${plugin.artifacts}"
- * @required
* @since 1.0
*/
- @SuppressWarnings( "rawtypes" )
- private List pluginArtifacts;
+ @Parameter( defaultValue = "${plugin.artifacts}", required = true )
+ private List<Artifact> pluginArtifacts;
/**
* If set to true ignore if packaging of project is not 'war'.
*
- * @parameter expression="${tomcat.ignorePackaging}" default-value="false"
* @since 1.0
*/
+ @Parameter( property = "tomcat.ignorePackaging", defaultValue = "false" )
private boolean ignorePackaging;
/**
* Override the default keystoreFile for the HTTPS connector (if enabled)
*
- * @parameter
* @since 1.1
*/
+ @Parameter
private String keystoreFile;
/**
* Override the default keystorePass for the HTTPS connector (if enabled)
*
- * @parameter
* @since 1.1
*/
+ @Parameter
private String keystorePass;
/**
* Override the type of keystore file to be used for the server
certificate. If not specified, the default value is "JKS".
*
- * @parameter default-value="JKS"
- * @since 2.0.1
+ * @since 2.0
*/
+ @Parameter( defaultValue = "JKS" )
private String keystoreType;
/**
@@ -326,11 +316,11 @@ public abstract class AbstractRunMojo
* Tomcat. Instead please configure naming in the <code>server.xml</code>.
* </p>
*
- * @parameter expression="${maven.tomcat.useNaming}" default-value="true"
* @see <a
href="http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/startup/Embedded.html";>org.apache.catalina.startup.Embedded</a>
* @see <a
href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/startup/Tomcat.html";>org.apache.catalina.startup.Tomcat</a>
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.useNaming", defaultValue = "true" )
private boolean useNaming;
/**
@@ -338,9 +328,9 @@ public abstract class AbstractRunMojo
* The other way to use contextReloadable is to add attribute reloadable =
"true"
* in your context file.
*
- * @parameter expression="${maven.tomcat.contextReloadable}"
default-value="false"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.contextReloadable", defaultValue =
"false" )
protected boolean contextReloadable;
@@ -348,105 +338,99 @@ public abstract class AbstractRunMojo
* <p>The path of the Tomcat context XML file.</p>
* <p>Since release 2.0, the file is filtered as a maven resource so you
can use
* interpolation tokens ${ }</p>
- *
- * @parameter expression="${maven.tomcat.contextFile}"
*/
+ @Parameter( property = "maven.tomcat.contextFile" )
protected File contextFile;
/**
* The protocol to run the Tomcat server on.
* By default it's HTTP/1.1.
*
- * @parameter expression="${maven.tomcat.protocol}"
default-value="HTTP/1.1"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.protocol", defaultValue = "HTTP/1.1" )
private String protocol;
/**
* The path of the Tomcat users XML file.
*
- * @parameter expression = "${maven.tomcat.tomcatUsers.file}"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.tomcatUsers.file" )
private File tomcatUsers;
/**
* The path of the Tomcat logging configuration.
*
- * @parameter expression = "${maven.tomcat.tomcatLogging.file}"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.tomcatLogging.file" )
private File tomcatLoggingFile;
/**
* Skip execution
*
- * @parameter expression="${maven.tomcat.skip}" default-value="false"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.skip", defaultValue = "false" )
protected boolean skip;
/**
- * @parameter
* @see {@link Webapp}
* @since 2.0
*/
+ @Parameter
private List<Webapp> webapps;
/**
* The static context
*
- * @parameter expression="${maven.tomcat.staticContextPath}"
default-value="/"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.staticContextPath", defaultValue =
"/" )
private String staticContextPath;
/**
* The static context docroot base fully qualified path
* if <code>null</code> static context won't be added
*
- * @parameter expression="${maven.tomcat.staticContextDocbase}"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.staticContextDocbase" )
private String staticContextDocbase;
/**
* Class loader class to set.
*
- * @parameter
* @since 2.0
*/
+ @Parameter
protected String classLoaderClass;
- /**
- * @parameter default-value="${session}"
- * @readonly
- * @required
- */
+ @Parameter( defaultValue = "${session}", readonly = true, required = true )
protected MavenSession session;
/**
* Will dump port in a properties file (see ports for property names).
* If empty no file generated
- *
- * @parameter expression="${maven.tomcat.propertiesPortFilePath}"
*/
+ @Parameter( property = "maven.tomcat.propertiesPortFilePath" )
protected String propertiesPortFilePath;
/**
* configure host name
*
- * @parameter expression="${maven.tomcat.hostName}"
default-value="localhost"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.hostName", defaultValue = "localhost"
)
protected String hostName;
/**
* configure aliases
*
- * @parameter
* @since 2.0
*/
+ @Parameter
protected String[] aliases;
// ----------------------------------------------------------------------
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunWarMojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunWarMojo.java
Tue Jul 31 16:01:40 2012
@@ -19,12 +19,13 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.plugins.annotations.Parameter;
+
import java.io.File;
/**
* Runs the current project as a packaged web application using an embedded
Tomcat server.
- *
- * @requiresDependencyResolution runtime
+ *
* @author Mark Hobson <[email protected]>
* @todo depend on war:exploded when MNG-1649 resolved
*/
@@ -37,18 +38,14 @@ public abstract class AbstractRunWarMojo
/**
* The path of the exploded WAR directory to run.
- *
- * @parameter expression =
"${project.build.directory}/${project.build.finalName}"
- * @required
*/
+ @Parameter( defaultValue =
"${project.build.directory}/${project.build.finalName}", required = true )
private File warDirectory;
/**
* The path of the Tomcat context XML file.
- *
- * @parameter expression =
- *
"${project.build.directory}/${project.build.finalName}/META-INF/context.xml"
*/
+ @Parameter( defaultValue =
"${project.build.directory}/${project.build.finalName}/META-INF/context.xml" )
private File contextFile;
// ----------------------------------------------------------------------
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=1367641&r1=1367640&r2=1367641&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
Tue Jul 31 16:01:40 2012
@@ -18,16 +18,21 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+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>
+ *
* @author Olivier Lamy
- * @goal exec-war
- * @execute phase="package"
* @since 2.0
*/
+@Mojo( name = "exec-war" )
+@Execute( phase = LifecyclePhase.PACKAGE )
public class ExecWarMojo
extends AbstractExecWarMojo
{
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=1367641&r1=1367640&r2=1367641&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
Tue Jul 31 16:01:40 2012
@@ -18,11 +18,13 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.plugins.annotations.Mojo;
+
/**
* @author Olivier Lamy
- * @goal exec-war-only
* @since 2.0
*/
+@Mojo( name = "exec-war-only" )
public class ExecWarOnlyMojo
extends AbstractExecWarMojo
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Tue Jul 31 16:01:40 2012
@@ -23,6 +23,12 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFileFilterRequest;
import org.apache.maven.shared.filtering.MavenFilteringException;
@@ -48,11 +54,10 @@ import java.util.Set;
* Runs the current project as a dynamic web application using an embedded
Tomcat server.
*
* @author Olivier Lamy
- * @goal run
- * @execute phase="compile"
- * @requiresDependencyResolution test
* @since 2.0
*/
+@Mojo( name = "run", requiresDependencyResolution = ResolutionScope.TEST )
+@Execute( phase = LifecyclePhase.COMPILE )
public class RunMojo
extends AbstractRunMojo
{
@@ -63,74 +68,65 @@ public class RunMojo
/**
* The set of dependencies for the web application being run.
- *
- * @parameter default-value = "${project.artifacts}"
- * @required
- * @readonly
*/
+ @Parameter( defaultValue = "${project.artifacts}", required = true,
readonly = true )
private Set<Artifact> dependencies;
/**
* The web resources directory for the web application being run.
- *
- * @parameter default-value="${basedir}/src/main/webapp" expression =
"${tomcat.warSourceDirectory}"
*/
+ @Parameter( defaultValue = "${basedir}/src/main/webapp", property =
"tomcat.warSourceDirectory" )
private File warSourceDirectory;
/**
* Set the "follow standard delegation model" flag used to configure our
ClassLoader.
*
- * @parameter expression = "${tomcat.delegate}" default-value="true"
* @see
http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/loader/WebappLoader.html#setDelegate(boolean)
* @since 1.0
*/
+ @Parameter( property = "tomcat.delegate", defaultValue = "true" )
private boolean delegate = true;
/**
* represents the delay in seconds between each classPathScanning change
invocation
*
- * @parameter expression="${maven.tomcat.backgroundProcessorDelay}"
default-value="-1"
* @see <a
href="http://tomcat.apache.org/tomcat-7.0-doc/config/context.html";>http://tomcat.apache.org/tomcat-7.0-doc/config/context.html</a>
*/
+ @Parameter( property = "maven.tomcat.backgroundProcessorDelay",
defaultValue = "-1" )
protected int backgroundProcessorDelay = -1;
/**
- * @readonly
- * @component
* @since 2.0
*/
+ @Component
private ClassLoaderEntriesCalculator classLoaderEntriesCalculator;
/**
* will add /WEB-INF/lib/*.jar and /WEB-INF/classes from war dependencies
in the webappclassloader
*
- * @parameter expression="${maven.tomcat.addWarDependenciesInClassloader}"
default-value="true"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.addWarDependenciesInClassloader",
defaultValue = "true" )
private boolean addWarDependenciesInClassloader;
/**
* will use the test classpath rather than the compile one and will add
test dependencies too
*
- * @parameter expression="${maven.tomcat.useTestClasspath}"
default-value="false"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.useTestClasspath", defaultValue =
"false" )
private boolean useTestClasspath;
/**
* Additional optional directories to add to the embedded tomcat classpath.
*
- * @parameter alias = "additionalClassesDirs"
* @since 2.0
*/
+ @Parameter( alias = "additionalClassesDirs" )
private List<String> additionalClasspathDirs;
- /**
- *
- * @component role="org.apache.maven.shared.filtering.MavenFileFilter"
role-hint="default"
- * @required
- */
+ @Component( role = MavenFileFilter.class, hint = "default" )
private MavenFileFilter mavenFileFilter;
/**
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarMojo.java?rev=1367641&r1=1367640&r2=1367641&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarMojo.java
Tue Jul 31 16:01:40 2012
@@ -20,17 +20,21 @@ package org.apache.tomcat.maven.plugin.t
*/
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
/**
* Runs the current project as a packaged web application using an embedded
Tomcat server.
- *
- * @goal run-war
- * @execute phase="package"
- * @requiresDependencyResolution runtime
+ *
* @author Mark Hobson <[email protected]>
* @todo depend on war:exploded when MNG-1649 resolved
*/
+@Mojo( name = "run-war", requiresDependencyResolution =
ResolutionScope.RUNTIME )
+@Execute( phase = LifecyclePhase.PACKAGE )
public class RunWarMojo
extends AbstractRunWarMojo
{
- // no-op : only mojo metadata overriding
+ // no-op : only mojo metadata overriding
}
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=1367641&r1=1367640&r2=1367641&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
Tue Jul 31 16:01:40 2012
@@ -20,13 +20,15 @@ package org.apache.tomcat.maven.plugin.t
*/
+import org.apache.maven.plugins.annotations.Mojo;
+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.
*
* @author vlatombe
- * @goal run-war-only
- * @requiresDependencyResolution runtime
*/
+@Mojo( name = "run-war-only", requiresDependencyResolution =
ResolutionScope.RUNTIME )
public class RunWarOnlyMojo
extends AbstractRunWarMojo
{
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=1367641&r1=1367640&r2=1367641&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
Tue Jul 31 16:01:40 2012
@@ -20,6 +20,9 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.tomcat.maven.common.run.EmbeddedRegistry;
import org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo;
@@ -35,10 +38,9 @@ import org.apache.tomcat.maven.plugin.to
* </p>
*
* @author Mark Michaelis
- * @goal shutdown
- * @requiresDependencyResolution runtime
* @since 2.0
*/
+@Mojo( name = "shutdown", requiresDependencyResolution =
ResolutionScope.RUNTIME )
public class ShutdownMojo
extends AbstractTomcat7Mojo
{
@@ -46,17 +48,17 @@ public class ShutdownMojo
/**
* Ignore error when shutdown
*
- * @parameter expression="${maven.tomcat.skipErrorOnShutdown}"
default-value="false"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.skipErrorOnShutdown", defaultValue =
"false" )
protected boolean skipErrorOnShutdown;
/**
* Skip execution
*
- * @parameter expression="${maven.tomcat.skipShutdown}"
default-value="false"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.skipShutdown", defaultValue = "false"
)
protected boolean skip;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
