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 2014/08/13 02:17:18 UTC
svn commit: r1617631 - in /tomcat/maven-plugin/branches/tc8.x: ./
tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/
tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/
Author: olamy
Date: Wed Aug 13 00:17:18 2014
New Revision: 1617631
URL: http://svn.apache.org/r1617631
Log:
formatting
Modified:
tomcat/maven-plugin/branches/tc8.x/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8RunnerCli.java
Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1617631&r1=1617630&r2=1617631&view=diff
==============================================================================
--- tomcat/maven-plugin/branches/tc8.x/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Aug 13 00:17:18 2014
@@ -302,7 +302,7 @@
<module>tomcat6-maven-plugin</module>
<module>tomcat7-war-runner</module>
<module>tomcat7-maven-plugin</module>
- <module>tomcat8-war-runner</module>
+ <module>tomcat8-war-runner</module>
<module>tomcat8-maven-plugin</module>
<module>tomcat-maven-archetype</module>
</modules>
Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java?rev=1617631&r1=1617630&r2=1617631&view=diff
==============================================================================
--- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java (original)
+++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java Wed Aug 13 00:17:18 2014
@@ -322,10 +322,10 @@ public abstract class AbstractExecWarMoj
"Dependency '" + dependency.getGroupId() + "':'" + dependency.getArtifactId()
+ "' does not have version specified" );
}
- Artifact artifact = artifactFactory.createArtifactWithClassifier( dependency.getGroupId(),
- dependency.getArtifactId(),
- version,
- dependency.getType(),
+ Artifact artifact = artifactFactory.createArtifactWithClassifier( dependency.getGroupId(), //
+ dependency.getArtifactId(), //
+ version, //
+ dependency.getType(), //
dependency.getClassifier() );
artifactResolver.resolve( artifact, this.remoteRepos, this.local );
@@ -385,10 +385,10 @@ public abstract class AbstractExecWarMoj
// add tomcat classes
for ( Artifact pluginArtifact : pluginArtifacts )
{
- if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) || StringUtils.equals(
- "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals(
- "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli",
- pluginArtifact.getArtifactId() )
+ if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) //
+ || StringUtils.equals( "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) //
+ || StringUtils.equals( "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) //
+ || StringUtils.equals( "commons-cli", pluginArtifact.getArtifactId() ) //
|| StringUtils.equals( "tomcat8-war-runner", pluginArtifact.getArtifactId() ) )
{
JarFile jarFile = new JarFile( pluginArtifact.getFile() );
@@ -415,9 +415,11 @@ public abstract class AbstractExecWarMoj
}
// String groupId, String artifactId, String version, String scope, String type
- Artifact artifact =
- artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(), version,
- dependency.getScope(), dependency.getType() );
+ Artifact artifact = artifactFactory.createArtifact( dependency.getGroupId(), //
+ dependency.getArtifactId(), //
+ version, //
+ dependency.getScope(), //
+ dependency.getType() );
artifactResolver.resolve( artifact, this.remoteRepos, this.local );
JarFile jarFile = new JarFile( artifact.getFile() );
@@ -518,7 +520,7 @@ public abstract class AbstractExecWarMoj
}
// search in project.dependencies
- for ( Dependency projectDependency : (List<Dependency>) this.project.getDependencyManagement().getDependencies() )
+ for ( Dependency projectDependency : this.project.getDependencyManagement().getDependencies() )
{
if ( sameDependencyWithoutVersion( dependency, projectDependency ) )
{
Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java?rev=1617631&r1=1617630&r2=1617631&view=diff
==============================================================================
--- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java (original)
+++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java Wed Aug 13 00:17:18 2014
@@ -57,15 +57,15 @@ public abstract class AbstractStandalone
/**
* Name of the generated WAR.
*/
- @Parameter(property = "tomcat.jar.finalName",
- defaultValue = "${project.artifactId}-${project.version}-standalone.war", required = true)
+ @Parameter( property = "tomcat.jar.finalName",
+ defaultValue = "${project.artifactId}-${project.version}-standalone.war", required = true )
protected String finalName;
/**
* the classifier to use for the attached/generated artifact
*/
- @Parameter(property = "maven.tomcat.exec.war.attachArtifactClassifier", defaultValue = "standalone",
- required = true)
+ @Parameter( property = "maven.tomcat.exec.war.attachArtifactClassifier", defaultValue = "standalone",
+ required = true )
protected String attachArtifactClassifier;
/**
@@ -73,7 +73,7 @@ public abstract class AbstractStandalone
*
* @since 2.2
*/
- @Parameter(property = "maven.tomcat.exec.war.attachArtifactType", defaultValue = "war", required = true)
+ @Parameter( property = "maven.tomcat.exec.war.attachArtifactType", defaultValue = "war", required = true )
protected String attachArtifactClassifierType;
public void execute()
@@ -175,10 +175,10 @@ public abstract class AbstractStandalone
// add tomcat classes
for ( Artifact pluginArtifact : pluginArtifacts )
{
- if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) || StringUtils.equals(
- "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals(
- "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli",
- pluginArtifact.getArtifactId() )
+ if ( StringUtils.equals( "org.apache.tomcat", pluginArtifact.getGroupId() ) //
+ || StringUtils.equals( "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) //
+ || StringUtils.equals( "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) //
+ || StringUtils.equals( "commons-cli", pluginArtifact.getArtifactId() ) //
|| StringUtils.equals( "tomcat8-war-runner", pluginArtifact.getArtifactId() ) )
{
JarFile jarFile = new JarFile( pluginArtifact.getFile() );
@@ -204,9 +204,11 @@ public abstract class AbstractStandalone
+ "' does not have version specified" );
}
// String groupId, String artifactId, String version, String scope, String type
- Artifact artifact =
- artifactFactory.createArtifact( dependency.getGroupId(), dependency.getArtifactId(), version,
- dependency.getScope(), dependency.getType() );
+ Artifact artifact = artifactFactory.createArtifact( dependency.getGroupId(), //
+ dependency.getArtifactId(), //
+ version, //
+ dependency.getScope(), //
+ dependency.getType() );
artifactResolver.resolve( artifact, this.remoteRepos, this.local );
JarFile jarFile = new JarFile( artifact.getFile() );
Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8RunnerCli.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8RunnerCli.java?rev=1617631&r1=1617630&r2=1617631&view=diff
==============================================================================
--- tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8RunnerCli.java (original)
+++ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8RunnerCli.java Wed Aug 13 00:17:18 2014
@@ -36,7 +36,7 @@ import java.util.Properties;
* @author Olivier Lamy
* @since 2.0
*/
-@SuppressWarnings("static-access")
+@SuppressWarnings( "static-access" )
public class Tomcat8RunnerCli
{
@@ -98,10 +98,22 @@ public class Tomcat8RunnerCli
static
{
- options.addOption( httpPort ).addOption( httpsPort ).addOption( ajpPort ).addOption( serverXmlPath ).addOption(
- resetExtract ).addOption( help ).addOption( debug ).addOption( sysProps ).addOption(
- httpProtocol ).addOption( clientAuth ).addOption( keyAlias ).addOption( obfuscate ).addOption(
- extractDirectory ).addOption( loggerName ).addOption( uriEncoding ).addOption( maxPostSize );
+ options.addOption( httpPort ) //
+ .addOption( httpsPort ) //
+ .addOption( ajpPort ) //
+ .addOption( serverXmlPath ) //
+ .addOption( resetExtract ) //
+ .addOption( help ) //
+ .addOption( debug ) //
+ .addOption( sysProps ) //
+ .addOption( httpProtocol ) //
+ .addOption( clientAuth ) //
+ .addOption( keyAlias ) //
+ .addOption( obfuscate ) //
+ .addOption( extractDirectory ) //
+ .addOption( loggerName ) //
+ .addOption( uriEncoding ) //
+ .addOption( maxPostSize );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org