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 2012/07/31 18:01:21 UTC
svn commit: r1367640 - in /tomcat/maven-plugin/trunk: ./
tomcat6-maven-plugin/
tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/
tomcat6-maven-plugin/src/test/resources/simple-war-project/
tomcat7-maven-plugin/
Author: olamy
Date: Tue Jul 31 16:01:20 2012
New Revision: 1367640
URL: http://svn.apache.org/viewvc?rev=1367640&view=rev
Log:
[MTOMCAT-157] use new Maven Plugins annotations. done for tomcat6 mojos.
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunWarMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractWarCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployMojo.java
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/ExplodedMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/InplaceMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.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/ReloadMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarMojo.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/ServerInfoMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ShutdownMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Jul 31 16:01:20 2012
@@ -384,6 +384,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>common-tomcat-maven-plugin</artifactId>
<version>${project.version}</version>
@@ -593,7 +600,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
+ <version>3.1</version>
+ <configuration>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ <executions>
+ <execution>
+ <id>mojo-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ <!-- if you want to generate help goal -->
+ <execution>
+ <id>help-goal</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -717,7 +742,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
+ <version>3.1</version>
<configuration>
<requirements>
<jdk>${maven.compiler.target}</jdk>
@@ -727,7 +752,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.8.1</version>
<configuration>
<links>
<link>http://tomcat.apache.org/tomcat-6.0-doc/api/</link>
@@ -738,7 +763,7 @@
<tagletArtifact>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>2.9</version>
+ <version>3.1</version>
</tagletArtifact>
<tagletArtifact>
<groupId>org.codehaus.plexus</groupId>
@@ -769,7 +794,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9.1</version>
<configuration>
<configLocation>config/maven_checks.xml</configLocation>
<headerLocation>config/maven-header.txt</headerLocation>
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Tue Jul 31 16:01:20 2012
@@ -53,6 +53,11 @@
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
</dependency>
@@ -177,14 +182,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java Tue Jul 31 16:01:20 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( role = WagonManager.class )
private WagonManager wagonManager;
/**
* The full URL of the Tomcat manager instance to use.
- *
- * @parameter expression="${maven.tomcat.url}" default-value="http://localhost:8080/manager"
- * @required
*/
+ @Parameter( property = "maven.tomcat.url", defaultValue = "http://localhost:8080/manager", 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( property = "plugin.version", required = true, readonly = true )
private String version;
// ----------------------------------------------------------------------
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java Tue Jul 31 16:01:20 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 java.io.File;
@@ -41,32 +42,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/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=1367640&r1=1367639&r2=1367640&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 Tue Jul 31 16:01:20 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 java.io.File;
@@ -38,10 +39,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/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java Tue Jul 31 16:01:20 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;
/**
@@ -31,9 +33,7 @@ public abstract class AbstractI18NTomcat
extends AbstractMojo
{
- /**
- * @component
- */
+ @Component( role = MessagesProvider.class )
protected MessagesProvider messagesProvider;
// ----------------------------------------------------------------------
@@ -43,10 +43,8 @@ public abstract class AbstractI18NTomcat
/**
* 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( property = "maven.tomcat.path", defaultValue = "/${project.artifactId}", required = true )
protected String path;
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=1367640&r1=1367639&r2=1367640&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 Jul 31 16:01:20 2012
@@ -32,13 +32,18 @@ import org.apache.catalina.servlets.Defa
import org.apache.catalina.startup.Catalina;
import org.apache.catalina.startup.Embedded;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
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.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.tomcat.maven.common.config.AbstractWebapp;
import org.apache.tomcat.maven.common.run.EmbeddedRegistry;
@@ -69,7 +74,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -89,26 +93,21 @@ public abstract class AbstractRunMojo
/**
* Used to look up Artifacts in the remote repository.
- *
- * @component
*/
- protected org.apache.maven.artifact.factory.ArtifactFactory factory;
+ @Component( role = ArtifactFactory.class )
+ protected ArtifactFactory artifactFactory;
/**
* Location of the local repository.
- *
- * @parameter expression="${localRepository}"
- * @readonly
- * @required
*/
- private org.apache.maven.artifact.repository.ArtifactRepository local;
+ @Parameter( defaultValue = "${localRepository}", required = true, readonly = true )
+ private ArtifactRepository artifactRepository;
/**
* Used to look up Artifacts in the remote repository.
- *
- * @component
*/
- protected org.apache.maven.artifact.resolver.ArtifactResolver resolver;
+ @Component( role = ArtifactResolver.class )
+ protected ArtifactResolver artifactResolver;
// ----------------------------------------------------------------------
// Mojo Parameters
@@ -116,25 +115,20 @@ 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.
- *
- * @parameter expression="${maven.tomcat.port}" default-value="8080"
*/
+ @Parameter( property = "maven.tomcat.port", defaultValue = "8080" )
private int port;
/**
@@ -142,9 +136,9 @@ public abstract class AbstractRunMojo
* By default it's 0 this means won't be started.
* The ajp connector will be started only for value > 0.
*
- * @parameter expression="${maven.tomcat.ajp.port}" default-value="0"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.ajp.port", defaultValue = "0" )
private int ajpPort;
/**
@@ -152,9 +146,9 @@ public abstract class AbstractRunMojo
* By default it's ajp.
* NOTE The ajp connector will be started only if {@link #ajpPort} > 0.
*
- * @parameter expression="${maven.tomcat.ajp.protocol}" default-value="ajp"
* @since 2.0
*/
+ @Parameter( property = "maven.tomcat.ajp.protocol", defaultValue = "ajp" )
private String ajpProtocol;
/**
@@ -162,58 +156,58 @@ public abstract class AbstractRunMojo
* By default it's 0 this means won't be started.
* The https connector will be started only for value > 0.
*
- * @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;
/**
@@ -225,76 +219,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( role = ArchiverManager.class )
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;
/**
@@ -308,12 +298,10 @@ public abstract class AbstractRunMojo
* Tomcat. Instead please configure naming in the <code>server.xml</code>.
* </p>
*
- * @parameter expression="${maven.tomcat.useNaming}" default-value="true"
- * @todo adopt documentation once Tomcat 7 is supported (MTOMCAT-62)
* @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;
/**
@@ -321,57 +309,55 @@ 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;
/**
* The path of the Tomcat context XML file.
- *
- * @parameter expression="src/main/webapp/META-INF/context.xml"
*/
+ @Parameter( defaultValue = "src/main/webapp/META-INF/context.xml" )
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}"
*/
+ @Parameter( property = "maven.tomcat.tomcatUsers.file" )
private File tomcatUsers;
/**
* to install a manager in your embeded tomcat
*
- * @parameter
* @since 2.0
*/
+ @Parameter
private File managerWarPath;
/**
* 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;
// ----------------------------------------------------------------------
@@ -386,26 +372,26 @@ public abstract class AbstractRunMojo
/**
* 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;
// ----------------------------------------------------------------------
@@ -814,6 +800,8 @@ public abstract class AbstractRunMojo
engine.setDefaultHost( host.getName() );
container.addEngine( engine );
+ getLog().debug( "start tomcat instance on http port:" + port + " and protocol: " + protocol );
+
// create http connector
Connector httpConnector = container.createConnector( (InetAddress) null, port, protocol );
if ( httpsPort > 0 )
@@ -894,9 +882,8 @@ public abstract class AbstractRunMojo
ClassWorld world = new ClassWorld();
ClassRealm root = world.newRealm( "tomcat", Thread.currentThread().getContextClassLoader() );
- for ( @SuppressWarnings( "rawtypes" ) Iterator i = pluginArtifacts.iterator(); i.hasNext(); )
+ for ( Artifact pluginArtifact : pluginArtifacts )
{
- Artifact pluginArtifact = (Artifact) i.next();
// add all plugin artifacts see https://issues.apache.org/jira/browse/MTOMCAT-122
if ( pluginArtifact.getFile() != null )
{
@@ -1097,21 +1084,23 @@ public abstract class AbstractRunMojo
if ( StringUtils.isEmpty( additionalWebapp.getClassifier() ) )
{
- artifact =
- factory.createDependencyArtifact( additionalWebapp.getGroupId(), additionalWebapp.getArtifactId(), vr,
- additionalWebapp.getType(), null, Artifact.SCOPE_COMPILE );
+ artifact = artifactFactory.createDependencyArtifact( additionalWebapp.getGroupId(),
+ additionalWebapp.getArtifactId(), vr,
+ additionalWebapp.getType(), null,
+ Artifact.SCOPE_COMPILE );
}
else
{
- artifact =
- factory.createDependencyArtifact( additionalWebapp.getGroupId(), additionalWebapp.getArtifactId(), vr,
- additionalWebapp.getType(), additionalWebapp.getClassifier(),
- Artifact.SCOPE_COMPILE );
+ artifact = artifactFactory.createDependencyArtifact( additionalWebapp.getGroupId(),
+ additionalWebapp.getArtifactId(), vr,
+ additionalWebapp.getType(),
+ additionalWebapp.getClassifier(),
+ Artifact.SCOPE_COMPILE );
}
try
{
- resolver.resolve( artifact, project.getRemoteArtifactRepositories(), this.local );
+ artifactResolver.resolve( artifact, project.getRemoteArtifactRepositories(), this.artifactRepository );
}
catch ( ArtifactResolutionException e )
{
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunWarMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunWarMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunWarMojo.java Tue Jul 31 16:01:20 2012
@@ -19,13 +19,14 @@ 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.
*
* @author Mark Hobson <ma...@gmail.com>
- * @requiresDependencyResolution runtime
* @todo depend on war:exploded when MNG-1649 resolved
*/
public abstract class AbstractRunWarMojo
@@ -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/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractWarCatalinaMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractWarCatalinaMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractWarCatalinaMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractWarCatalinaMojo.java Tue Jul 31 16:01:20 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/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/DeployMojo.java Tue Jul 31 16:01:20 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 <ma...@gmail.com>
- * @goal deploy
- * @execute phase="package"
*/
+@Mojo( name = "deploy" )
+@Execute( phase = LifecyclePhase.PACKAGE )
public class DeployMojo
extends AbstractDeployWarMojo
{
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=1367640&r1=1367639&r2=1367640&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 Tue Jul 31 16:01:20 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/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExplodedMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExplodedMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExplodedMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ExplodedMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,8 @@ 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 java.io.File;
@@ -27,9 +29,9 @@ import java.io.File;
* Deploy an exploded WAR to Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal exploded
* @todo depend on war:exploded when MNG-1649 resolved
*/
+@Mojo( name = "exploded" )
public class ExplodedMojo
extends AbstractDeployMojo
{
@@ -39,10 +41,8 @@ public class ExplodedMojo
/**
* The path of the exploded WAR directory to deploy.
- *
- * @parameter expression = "${project.build.directory}/${project.build.finalName}"
- * @required
*/
+ @Parameter( defaultValue = "${project.build.directory}/${project.build.finalName}", required = true )
private File warDirectory;
// ----------------------------------------------------------------------
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/InplaceMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/InplaceMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/InplaceMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/InplaceMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,8 @@ 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 java.io.File;
@@ -27,9 +29,9 @@ import java.io.File;
* Deploy a WAR in-place to Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal inplace
* @todo depend on war:inplace when MNG-1649 resolved
*/
+@Mojo( name = "inplace" )
public class InplaceMojo
extends AbstractDeployMojo
{
@@ -39,10 +41,8 @@ public class InplaceMojo
/**
* The path of the inplace WAR directory to deploy.
- *
- * @parameter expression = "${basedir}/src/main/webapp"
- * @required
*/
+ @Parameter( defaultValue = "${basedir}/src/main/webapp", required = true )
private File warSourceDirectory;
// ----------------------------------------------------------------------
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.io.IOException;
* Lists all the currently deployed web applications in Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal list
*/
+@Mojo( name = "list" )
public class ListMojo
extends AbstractCatalinaMojo
{
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=1367640&r1=1367639&r2=1367640&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 Tue Jul 31 16:01:20 2012
@@ -19,13 +19,15 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.plugins.annotations.Mojo;
+
/**
* Redeploy a WAR in Tomcat. Deploy with forcing update flag to true
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal redeploy
* @todo depend on war:war, war:exploded or war:inplace when MNG-1649 resolved
*/
+@Mojo( name = "redeploy" )
public class RedeployMojo
extends DeployMojo
{
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.io.IOException;
* Reload a WAR in Tomcat.
*
* @author olamy
- * @goal reload
*/
+@Mojo( name = "reload" )
public class ReloadMojo
extends AbstractWarCatalinaMojo
{
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.io.IOException;
* Lists JNDI resources in Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal resources
*/
+@Mojo( name = "resources" )
public class ResourcesMojo
extends AbstractCatalinaMojo
{
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.io.IOException;
* Lists security roles in Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal roles
*/
+@Mojo( name = "roles" )
public class RolesMojo
extends AbstractCatalinaMojo
{
@@ -46,6 +47,6 @@ public class RolesMojo
{
getLog().info( messagesProvider.getMessage( "RolesMojo.listRoles", getURL() ) );
- log( getManager().getRoles().getHttpResponseBody() );
+ log( getManager().getRoles().getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java Tue Jul 31 16:01:20 2012
@@ -26,6 +26,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.tomcat.maven.common.run.ClassLoaderEntriesCalculator;
import org.apache.tomcat.maven.common.run.ClassLoaderEntriesCalculatorRequest;
import org.apache.tomcat.maven.common.run.ClassLoaderEntriesCalculatorResult;
@@ -49,10 +55,9 @@ import java.util.Set;
*
* @author Jurgen Lust
* @author Mark Hobson <ma...@gmail.com>
- * @goal run
- * @execute phase="compile"
- * @requiresDependencyResolution test
*/
+@Mojo( name = "run", requiresDependencyResolution = ResolutionScope.TEST )
+@Execute( phase = LifecyclePhase.COMPILE )
public class RunMojo
extends AbstractRunMojo
{
@@ -63,67 +68,62 @@ 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-6.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-6.0-doc/config/context.html">http://tomcat.apache.org/tomcat-6.0-doc/config/context.html</a>
*/
+ @Parameter( property = "maven.tomcat.backgroundProcessorDelay", defaultValue = "-1" )
protected int backgroundProcessorDelay = -1;
/**
- * @readonly
- * @component
* @since 2.0
*/
+ @Component( role = ClassLoaderEntriesCalculator.class )
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-beta-1
*/
+ @Parameter( alias = "additionalClassesDirs" )
private List<String> additionalClasspathDirs;
// ----------------------------------------------------------------------
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunWarMojo.java Tue Jul 31 16:01:20 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 <ma...@gmail.com>
* @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/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=1367640&r1=1367639&r2=1367640&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 Tue Jul 31 16:01:20 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/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.io.IOException;
* Lists information about the Tomcat version, OS, and JVM properties.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal info
*/
+@Mojo( name = "info" )
public class ServerInfoMojo
extends AbstractCatalinaMojo
{
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.io.IOException;
* Lists session information for a WAR in Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal sessions
*/
+@Mojo( name = "sessions" )
public class SessionsMojo
extends AbstractWarCatalinaMojo
{
@@ -46,6 +47,6 @@ public class SessionsMojo
{
getLog().info( messagesProvider.getMessage( "SessionsMojo.listSessions", getDeployedURL() ) );
- log( getManager().getSessions( getPath() ).getHttpResponseBody() );
+ log( getManager().getSessions( getPath() ).getHttpResponseBody() );
}
}
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=1367640&r1=1367639&r2=1367640&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 Tue Jul 31 16:01:20 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;
@@ -34,10 +37,9 @@ import org.apache.tomcat.maven.common.ru
* </p>
*
* @author Mark Michaelis
- * @goal shutdown
- * @requiresDependencyResolution runtime
* @since 1.1
*/
+@Mojo( name = "shutdown", requiresDependencyResolution = ResolutionScope.RUNTIME )
public class ShutdownMojo
extends AbstractI18NTomcat6Mojo
{
@@ -45,17 +47,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;
/**
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.io.IOException;
* Start a WAR in Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal start
*/
+@Mojo( name = "start" )
public class StartMojo
extends AbstractWarCatalinaMojo
{
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +29,8 @@ import java.io.IOException;
* Stop a WAR in Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal stop
*/
+@Mojo( name = "stop" )
public class StopMojo
extends AbstractWarCatalinaMojo
{
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java Tue Jul 31 16:01:20 2012
@@ -20,6 +20,8 @@ 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.tomcat.maven.common.deployer.TomcatManagerException;
import java.io.IOException;
@@ -28,8 +30,8 @@ import java.io.IOException;
* Undeploy a WAR from Tomcat.
*
* @author Mark Hobson <ma...@gmail.com>
- * @goal undeploy
*/
+@Mojo( name = "undeploy" )
public class UndeployMojo
extends AbstractWarCatalinaMojo
{
@@ -39,9 +41,8 @@ public class UndeployMojo
/**
* Whether to fail the build if the web application cannot be undeployed.
- *
- * @parameter expression = "${maven.tomcat.failOnError}" default-value = "true"
*/
+ @Parameter( property = "maven.tomcat.failOnError", defaultValue = "true" )
private boolean failOnError;
// ----------------------------------------------------------------------
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml Tue Jul 31 16:01:20 2012
@@ -57,13 +57,14 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<id>tomcat-run</id>
+ <phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
- <phase>pre-integration-test</phase>
<configuration>
<port>${its.http.port}</port>
<ajpPort>${its.ajp.port}</ajpPort>
@@ -76,17 +77,17 @@
</execution>
<execution>
<id>tomcat-shutdown</id>
+ <phase>post-integration-test</phase>
<goals>
<goal>shutdown</goal>
</goals>
- <phase>post-integration-test</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.9</version>
+ <version>2.12</version>
<executions>
<execution>
<id>integration-test</id>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1367640&r1=1367639&r2=1367640&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Tue Jul 31 16:01:20 2012
@@ -166,6 +166,11 @@
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
</dependency>
@@ -229,14 +234,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org