You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/08/15 00:04:04 UTC
svn commit: r985591 - in
/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war:
packaging/WarProjectPackagingTask.java util/WebappStructure.java
Author: dennisl
Date: Sat Aug 14 22:04:04 2010
New Revision: 985591
URL: http://svn.apache.org/viewvc?rev=985591&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=985591&r1=985590&r2=985591&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Sat Aug 14 22:04:04 2010
@@ -198,7 +198,7 @@ public class WarProjectPackagingTask
protected void handleClassesDirectory( WarPackagingContext context )
throws MojoExecutionException
{
- ClassesPackagingTask task = new ClassesPackagingTask( currentProjectOverlay);
+ ClassesPackagingTask task = new ClassesPackagingTask( currentProjectOverlay );
task.performPackaging( context );
}
@@ -308,12 +308,12 @@ public class WarProjectPackagingTask
if ( !context.getWebappDirectory().exists() )
{
context.getLog().warn(
- "Not copying webapp webResources[" + resource.getDirectory() + "]: webapp directory[" +
- context.getWebappDirectory().getAbsolutePath() + "] does not exist!" );
+ "Not copying webapp webResources[" + resource.getDirectory() + "]: webapp directory["
+ + context.getWebappDirectory().getAbsolutePath() + "] does not exist!" );
}
- context.getLog().info( "Copying webapp webResources[" + resource.getDirectory() + "] to[" +
- context.getWebappDirectory().getAbsolutePath() + "]" );
+ context.getLog().info( "Copying webapp webResources[" + resource.getDirectory() + "] to["
+ + context.getWebappDirectory().getAbsolutePath() + "]" );
String[] fileNames = getFilesToCopy( resource );
for ( int i = 0; i < fileNames.length; i++ )
{
@@ -324,8 +324,8 @@ public class WarProjectPackagingTask
// MWAR-129 if targetPath is only a dot <targetPath>.</targetPath> or ./
// and the Resource is in a part of the warSourceDirectory the file from sources will override this
// that's we don't have to add the targetPath yep not nice but works
- if ( !StringUtils.equals( ".", resource.getTargetPath() ) &&
- !StringUtils.equals( "./", resource.getTargetPath() ) )
+ if ( !StringUtils.equals( ".", resource.getTargetPath() )
+ && !StringUtils.equals( "./", resource.getTargetPath() ) )
{
targetFileName = resource.getTargetPath() + File.separator + targetFileName;
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java?rev=985591&r1=985590&r2=985591&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java Sat Aug 14 22:04:04 2010
@@ -418,10 +418,10 @@ public class WebappStructure
{
DependencyInfo dependencyInfo = (DependencyInfo) it.next();
final Dependency dependency2 = dependencyInfo.getDependency();
- if ( StringUtils.equals( dependency.getGroupId(), dependency2.getGroupId() ) &&
- StringUtils.equals( dependency.getArtifactId(), dependency2.getArtifactId() ) &&
- StringUtils.equals( dependency.getType(), dependency2.getType() ) &&
- StringUtils.equals( dependency.getClassifier(), dependency2.getClassifier() ) )
+ if ( StringUtils.equals( dependency.getGroupId(), dependency2.getGroupId() )
+ && StringUtils.equals( dependency.getArtifactId(), dependency2.getArtifactId() )
+ && StringUtils.equals( dependency.getType(), dependency2.getType() )
+ && StringUtils.equals( dependency.getClassifier(), dependency2.getClassifier() ) )
{
return dependencyInfo.getTargetFileName();
@@ -452,12 +452,12 @@ public class WebappStructure
while ( it.hasNext() )
{
Dependency dep = (Dependency) it.next();
- if ( dependency.getGroupId().equals( dep.getGroupId() ) &&
- dependency.getArtifactId().equals( dep.getArtifactId() ) &&
- dependency.getType().equals( dep.getType() ) &&
- ( ( dependency.getClassifier() == null && dep.getClassifier() == null ) ||
- ( dependency.getClassifier() != null &&
- dependency.getClassifier().equals( dep.getClassifier() ) ) ) )
+ if ( dependency.getGroupId().equals( dep.getGroupId() )
+ && dependency.getArtifactId().equals( dep.getArtifactId() )
+ && dependency.getType().equals( dep.getType() )
+ && ( ( dependency.getClassifier() == null && dep.getClassifier() == null )
+ || ( dependency.getClassifier() != null
+ && dependency.getClassifier().equals( dep.getClassifier() ) ) ) )
{
return dep;
}