Author: olamy
Date: Wed Jul 23 04:14:53 2014
New Revision: 1612759
URL: http://svn.apache.org/r1612759
Log:
formatting and add @since
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
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=1612759&r1=1612758&r2=1612759&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
Wed Jul 23 04:14:53 2014
@@ -68,38 +68,38 @@ public abstract class AbstractExecWarMoj
extends AbstractTomcat7Mojo
{
- @Parameter( defaultValue = "${project.artifact}", required = true,
readonly = true )
+ @Parameter(defaultValue = "${project.artifact}", required = true, readonly
= true)
protected Artifact projectArtifact;
/**
* The maven project.
*/
- @Parameter( defaultValue = "${project}", required = true, readonly = true )
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
protected MavenProject project;
- @Parameter( defaultValue = "${plugin.artifacts}", required = true )
+ @Parameter(defaultValue = "${plugin.artifacts}", required = true)
protected List<Artifact> pluginArtifacts;
- @Parameter( defaultValue = "${project.build.directory}" )
+ @Parameter(defaultValue = "${project.build.directory}")
protected File buildDirectory;
/**
* Path under {@link #buildDirectory} where this mojo may do temporary
work.
*/
- @Parameter( defaultValue =
"${project.build.directory}/tomcat7-maven-plugin-exec" )
+ @Parameter(defaultValue =
"${project.build.directory}/tomcat7-maven-plugin-exec")
private File pluginWorkDirectory;
- @Parameter( property = "maven.tomcat.exec.war.tomcatConf", defaultValue =
"src/main/tomcatconf" )
+ @Parameter(property = "maven.tomcat.exec.war.tomcatConf", defaultValue =
"src/main/tomcatconf")
protected File tomcatConfigurationFilesDirectory;
- @Parameter( defaultValue = "src/main/tomcatconf/server.xml", property =
"maven.tomcat.exec.war.serverXml" )
+ @Parameter(defaultValue = "src/main/tomcatconf/server.xml", property =
"maven.tomcat.exec.war.serverXml")
protected File serverXml;
/**
* Name of the generated exec JAR.
*/
- @Parameter( property = "tomcat.jar.finalName",
- defaultValue =
"${project.artifactId}-${project.version}-war-exec.jar", required = true )
+ @Parameter(property = "tomcat.jar.finalName",
+ defaultValue =
"${project.artifactId}-${project.version}-war-exec.jar", required = true)
protected String finalName;
/**
@@ -107,14 +107,14 @@ public abstract class AbstractExecWarMoj
*
* @since 2.2
*/
- @Parameter( property = "maven.tomcat.skip", defaultValue = "false" )
+ @Parameter(property = "maven.tomcat.skip", defaultValue = "false")
private boolean skip;
/**
* The webapp context path to use for the web application being run.
* The name to store webapp in exec jar. Do not use /
*/
- @Parameter( property = "maven.tomcat.path", defaultValue =
"${project.artifactId}", required = true )
+ @Parameter(property = "maven.tomcat.path", defaultValue =
"${project.artifactId}", required = true)
protected String path;
@Parameter
@@ -132,13 +132,13 @@ public abstract class AbstractExecWarMoj
/**
* Location of the local repository.
*/
- @Parameter( defaultValue = "${localRepository}", required = true, readonly
= true )
+ @Parameter(defaultValue = "${localRepository}", required = true, readonly
= true)
protected ArtifactRepository local;
/**
* List of Remote Repositories used by the resolver
*/
- @Parameter( defaultValue = "${project.remoteArtifactRepositories}",
required = true, readonly = true )
+ @Parameter(defaultValue = "${project.remoteArtifactRepositories}",
required = true, readonly = true)
protected List<ArtifactRepository> remoteRepos;
@Component
@@ -147,15 +147,15 @@ public abstract class AbstractExecWarMoj
/**
* Attach or not the generated artifact to the build (use true if you want
to install or deploy it)
*/
- @Parameter( property = "maven.tomcat.exec.war.attachArtifact",
defaultValue = "true", required = true )
+ @Parameter(property = "maven.tomcat.exec.war.attachArtifact", defaultValue
= "true", required = true)
protected boolean attachArtifact;
/**
* the classifier to use for the attached/generated artifact
*/
- @Parameter( property = "maven.tomcat.exec.war.attachArtifactClassifier",
defaultValue = "exec-war",
- required = true )
+ @Parameter(property = "maven.tomcat.exec.war.attachArtifactClassifier",
defaultValue = "exec-war",
+ required = true)
protected String attachArtifactClassifier;
@@ -168,21 +168,22 @@ public abstract class AbstractExecWarMoj
/**
* to enable naming when starting tomcat
*/
- @Parameter( property = "maven.tomcat.exec.war.enableNaming", defaultValue
= "false", required = true )
+ @Parameter(property = "maven.tomcat.exec.war.enableNaming", defaultValue =
"false", required = true)
protected boolean enableNaming;
/**
* see http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html
+ * @since 2.3
*/
- @Parameter( property = "maven.tomcat.exec.war.enableRemoteIpValve",
defaultValue = "true",
- required = true )
+ @Parameter(property = "maven.tomcat.exec.war.enableRemoteIpValve",
defaultValue = "true",
+ required = true)
protected String enableRemoteIpValve;
/**
* see http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html
*/
- @Parameter( property = "maven.tomcat.exec.war.accessLogValveFormat",
defaultValue = "%h %l %u %t %r %s %b %I %D",
- required = true )
+ @Parameter(property = "maven.tomcat.exec.war.accessLogValveFormat",
defaultValue = "%h %l %u %t %r %s %b %I %D",
+ required = true)
protected String accessLogValveFormat;
/**
@@ -201,14 +202,14 @@ public abstract class AbstractExecWarMoj
/**
* Main class to use for starting the standalone jar.
*/
- @Parameter( property = "maven.tomcat.exec.war.mainClass",
- defaultValue =
"org.apache.tomcat.maven.runner.Tomcat7RunnerCli", required = true )
+ @Parameter(property = "maven.tomcat.exec.war.mainClass",
+ defaultValue =
"org.apache.tomcat.maven.runner.Tomcat7RunnerCli", required = true)
protected String mainClass;
/**
* which connector protocol to use HTTP/1.1 or
org.apache.coyote.http11.Http11NioProtocol
*/
- @Parameter( property = "maven.tomcat.exec.war.connectorHttpProtocol",
defaultValue = "HTTP/1.1", required = true )
+ @Parameter(property = "maven.tomcat.exec.war.connectorHttpProtocol",
defaultValue = "HTTP/1.1", required = true)
protected String connectorHttpProtocol;
/**
@@ -216,7 +217,7 @@ public abstract class AbstractExecWarMoj
*
* @since 2.2
*/
- @Parameter( property = "maven.tomcat.exec.war.httpPort" )
+ @Parameter(property = "maven.tomcat.exec.war.httpPort")
protected String httpPort;
/**
@@ -332,8 +333,7 @@ public abstract class AbstractExecWarMoj
}
Artifact artifact =
artifactFactory.createArtifactWithClassifier( dependency.getGroupId(),
dependency.getArtifactId(),
-
version,
-
dependency.getType(),
+
version, dependency.getType(),
dependency.getClassifier() );
artifactResolver.resolve( artifact, this.remoteRepos,
this.local );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
