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 2008/08/03 00:32:19 UTC
svn commit: r682073 - in
/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war:
overlay/ packaging/ util/
Author: dennisl
Date: Sat Aug 2 15:32:18 2008
New Revision: 682073
URL: http://svn.apache.org/viewvc?rev=682073&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
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/DependencyInfo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.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/overlay/OverlayManager.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java?rev=682073&r1=682072&r2=682073&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java Sat Aug 2 15:32:18 2008
@@ -136,8 +136,8 @@
it.set( overlay );
}
// default includes/excludes - only if the overlay uses the default settings
- if ( Arrays.equals( Overlay.DEFAULT_INCLUDES, overlay.getIncludes() ) &&
- Arrays.equals( Overlay.DEFAULT_EXCLUDES, overlay.getExcludes() ) )
+ if ( Arrays.equals( Overlay.DEFAULT_INCLUDES, overlay.getIncludes() )
+ && Arrays.equals( Overlay.DEFAULT_EXCLUDES, overlay.getExcludes() ) )
{
overlay.setIncludes( defaultIncludes );
overlay.setExcludes( defaultExcludes );
@@ -233,10 +233,10 @@
*/
private boolean compareOverlayWithArtifact( Overlay overlay, Artifact artifact )
{
- return ( StringUtils.equals( overlay.getGroupId(), artifact.getGroupId() ) &&
- StringUtils.equals( overlay.getArtifactId(), artifact.getArtifactId() ) &&
- StringUtils.equals( overlay.getType(), artifact.getType() ) &&
- StringUtils.equals( overlay.getClassifier(), artifact.getClassifier() ) );
+ return ( StringUtils.equals( overlay.getGroupId(), artifact.getGroupId() )
+ && StringUtils.equals( overlay.getArtifactId(), artifact.getArtifactId() )
+ && StringUtils.equals( overlay.getType(), artifact.getType() )
+ && StringUtils.equals( overlay.getClassifier(), artifact.getClassifier() ) );
}
/**
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=682073&r1=682072&r2=682073&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java Sat Aug 2 15:32:18 2008
@@ -118,7 +118,8 @@
* @param sourceFilesSet the files to be copied
* @throws IOException if an error occured while copying the files
*/
- protected void copyFiles( String sourceId, WarPackagingContext context, File sourceBaseDir, PathSet sourceFilesSet, boolean filtered )
+ protected void copyFiles( String sourceId, WarPackagingContext context, File sourceBaseDir, PathSet sourceFilesSet,
+ boolean filtered )
throws IOException, MojoExecutionException
{
copyFiles( sourceId, context, sourceBaseDir, sourceFilesSet, null, filtered );
@@ -158,15 +159,15 @@
public void refused( String ownerId, String targetFilename, String actualOwnerId )
throws IOException
{
- context.getLog().debug( " - " + targetFilename + " wasn't copied because it has " +
- "already been packaged for overlay[" + actualOwnerId + "]." );
+ context.getLog().debug( " - " + targetFilename + " wasn't copied because it has "
+ + "already been packaged for overlay[" + actualOwnerId + "]." );
}
public void superseded( String ownerId, String targetFilename, String deprecatedOwnerId )
throws IOException
{
- context.getLog().info( "File[" + targetFilename + "] belonged to overlay[" + deprecatedOwnerId +
- "] so it will be overwritten." );
+ context.getLog().info( "File[" + targetFilename + "] belonged to overlay[" + deprecatedOwnerId
+ + "] so it will be overwritten." );
copyFile( context, file, targetFile, targetFilename, false );
}
@@ -174,9 +175,9 @@
throws IOException
{
context.getLog()
- .warn( "File[" + targetFilename + "] belonged to overlay[" + unknownOwnerId +
- "] which does not exist anymore in the current project. It is recommended to invoke " +
- "clean if the dependencies of the project changed." );
+ .warn( "File[" + targetFilename + "] belonged to overlay[" + unknownOwnerId
+ + "] which does not exist anymore in the current project. It is recommended to invoke "
+ + "clean if the dependencies of the project changed." );
copyFile( context, file, targetFile, targetFilename, false );
}
} );
@@ -197,7 +198,8 @@
* @throws IOException if an error occured while copying
* @throws MojoExecutionException if an error occured while retrieving the filter properties
*/
- protected boolean copyFilteredFile( String sourceId, final WarPackagingContext context, File file, String targetFilename )
+ protected boolean copyFilteredFile( String sourceId, final WarPackagingContext context, File file,
+ String targetFilename )
throws IOException, MojoExecutionException
{
@@ -250,13 +252,13 @@
}
catch ( ArchiverException e )
{
- throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to[" +
- unpackDirectory.getAbsolutePath() + "]", e );
+ throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to["
+ + unpackDirectory.getAbsolutePath() + "]", e );
}
catch ( NoSuchArchiverException e )
{
- context.getLog().warn( "Skip unpacking dependency file[" + file.getAbsolutePath() +
- " with unknown extension[" + archiveExt + "]" );
+ context.getLog().warn( "Skip unpacking dependency file[" + file.getAbsolutePath()
+ + " with unknown extension[" + archiveExt + "]" );
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java?rev=682073&r1=682072&r2=682073&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java Sat Aug 2 15:32:18 2008
@@ -94,8 +94,8 @@
{
copyFile( id, context, artifact.getFile(), SERVICES_PATH + targetFileName );
}
- else if ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) ||
- "test-jar".equals( type ) )
+ else if ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type )
+ || "test-jar".equals( type ) )
{
copyFile( id, context, artifact.getFile(), LIB_PATH + targetFileName );
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java?rev=682073&r1=682072&r2=682073&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java Sat Aug 2 15:32:18 2008
@@ -52,8 +52,8 @@
protected void handleDependency( WarPackagingContext context, Dependency dependency, String notBundledMessage,
String warOrZipMessage, String standardMessage, boolean removeFile )
{
- if ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() ) ||
- Artifact.SCOPE_TEST.equals( dependency.getScope() ) || dependency.isOptional() )
+ if ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() )
+ || Artifact.SCOPE_TEST.equals( dependency.getScope() ) || dependency.isOptional() )
{
context.getLog().debug( notBundledMessage );
}
@@ -61,10 +61,10 @@
{
context.getLog().warn( warOrZipMessage );
}
- else if ( "tld".equals( dependency.getType() ) || "aar".equals( dependency.getType() ) ||
- "jar".equals( dependency.getType() ) || "ejb".equals( dependency.getType() ) ||
- "ejb-client".equals( dependency.getType() ) || "test-jar".equals( dependency.getType() ) ||
- "par".equals( dependency.getType() ) )
+ else if ( "tld".equals( dependency.getType() ) || "aar".equals( dependency.getType() )
+ || "jar".equals( dependency.getType() ) || "ejb".equals( dependency.getType() )
+ || "ejb-client".equals( dependency.getType() ) || "test-jar".equals( dependency.getType() )
+ || "par".equals( dependency.getType() ) )
{
context.getLog().info( standardMessage );
if ( removeFile )
@@ -81,10 +81,10 @@
{
context.getLog().warn( warOrZipMessage );
}
- else if ( "tld".equals( dependency.getType() ) || "aar".equals( dependency.getType() ) ||
- "jar".equals( dependency.getType() ) || "ejb".equals( dependency.getType() ) ||
- "ejb-client".equals( dependency.getType() ) || "test-jar".equals( dependency.getType() ) ||
- "par".equals( dependency.getType() ) )
+ else if ( "tld".equals( dependency.getType() ) || "aar".equals( dependency.getType() )
+ || "jar".equals( dependency.getType() ) || "ejb".equals( dependency.getType() )
+ || "ejb-client".equals( dependency.getType() ) || "test-jar".equals( dependency.getType() )
+ || "par".equals( dependency.getType() ) )
{
context.getLog().info( standardMessage );
if ( removeFile )
@@ -110,8 +110,8 @@
targetFile =
new File( context.getWebappDirectory(), ArtifactsPackagingTask.SERVICES_PATH + targetFileName );
}
- else if ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type ) ||
- "test-jar".equals( type ) )
+ else if ( "jar".equals( type ) || "ejb".equals( type ) || "ejb-client".equals( type )
+ || "test-jar".equals( type ) )
{
targetFile = new File( context.getWebappDirectory(), LIB_PATH + targetFileName );
}
@@ -165,39 +165,40 @@
public void removedDependency( Dependency dependency )
{
- handleDependency( context, dependency, "Dependency[" + dependency +
- "] has been removed from the project but it was not bundled anyway.", "Dependency[" + dependency +
- "] has been removed from the project. If it was included in the build as an overlay, " +
- "consider cleaning the target directory of the project (mvn clean)", "Dependency[" + dependency +
- "] has been removed from the project.", true );
+ handleDependency( context, dependency, "Dependency[" + dependency
+ + "] has been removed from the project but it was not bundled anyway.", "Dependency[" + dependency
+ + "] has been removed from the project. If it was included in the build as an overlay, "
+ + "consider cleaning the target directory of the project (mvn clean)", "Dependency[" + dependency
+ + "] has been removed from the project.", true );
}
public void updatedVersion( Dependency dependency, String previousVersion )
{
- handleDependency( context, dependency, "Version of dependency[" + dependency + "] has changed (" +
- previousVersion + " -> " + dependency.getVersion() + ") but it was not bundled anyway.",
- "Version of dependency[" + dependency + "] has changed (" +
- previousVersion + " -> " + dependency.getVersion() +
- "). If it was included in the build as an overlay, " +
- "consider " +
- "cleaning the target directory of the project (mvn clean)",
- "Version of dependency[" + dependency + "] has changed (" +
- previousVersion + " -> " + dependency.getVersion() + ").",
+ handleDependency( context, dependency, "Version of dependency[" + dependency + "] has changed ("
+ + previousVersion + " -> " + dependency.getVersion() + ") but it was not bundled anyway.",
+ "Version of dependency[" + dependency + "] has changed ("
+ + previousVersion + " -> " + dependency.getVersion()
+ + "). If it was included in the build as an overlay, "
+ + "consider "
+ + "cleaning the target directory of the project (mvn clean)",
+ "Version of dependency[" + dependency + "] has changed ("
+ + previousVersion + " -> " + dependency.getVersion() + ").",
true );
}
public void updatedScope( Dependency dependency, String previousScope )
{
if ( Artifact.SCOPE_PROVIDED.equals( dependency.getScope() ) || Artifact.SCOPE_TEST.equals(
- dependency.getScope() ) &&
- ( !Artifact.SCOPE_PROVIDED.equals( previousScope ) && !Artifact.SCOPE_TEST.equals( previousScope ) ) )
+ dependency.getScope() )
+ && ( !Artifact.SCOPE_PROVIDED.equals( previousScope )
+ && !Artifact.SCOPE_TEST.equals( previousScope ) ) )
{
// It's now provided or test so it should be removed
- handleDependencyScope( context, dependency, "Scope of dependency[" + dependency + "] has changed (" +
- previousScope + " -> " + dependency.getScope() +
- "). If it was included in the build as an overlay, " +
- "consider cleaning the target directory of the project (mvn clean)", "Scope of dependency[" +
- dependency + "] has changed (" + previousScope + " -> " + dependency.getScope() + ").", true );
+ handleDependencyScope( context, dependency, "Scope of dependency[" + dependency + "] has changed ("
+ + previousScope + " -> " + dependency.getScope()
+ + "). If it was included in the build as an overlay, "
+ + "consider cleaning the target directory of the project (mvn clean)", "Scope of dependency["
+ + dependency + "] has changed (" + previousScope + " -> " + dependency.getScope() + ").", true );
}
}
@@ -210,9 +211,9 @@
// It wasn't optional but now it is anymore
handleDependency( context, dependency,
"Dependency[" + dependency + "] is now optional but it was not bundled anyway.",
- "Dependency[" + dependency +
- "] is now optional. If it was included in the build as an overlay, " +
- "consider cleaning the target directory of the project (mvn clean)",
+ "Dependency[" + dependency
+ + "] is now optional. If it was included in the build as an overlay, "
+ + "consider cleaning the target directory of the project (mvn clean)",
"Dependency[" + dependency + "] is now optional", true );
@@ -221,11 +222,11 @@
public void updatedUnknown( Dependency dependency, Dependency previousDep )
{
- handleDependency( context, dependency, "Dependency[" + dependency + "] has changed (was " + previousDep +
- ") but it was not bundled anyway.", "Dependency[" + dependency + "] has changed (was " + previousDep +
- "). If it was included in the build as an overlay, " + "consider " +
- "cleaning the target directory of the project (mvn clean)", "Dependency[" + dependency +
- "] has changed (was " + previousDep + ").", true );
+ handleDependency( context, dependency, "Dependency[" + dependency + "] has changed (was " + previousDep
+ + ") but it was not bundled anyway.", "Dependency[" + dependency + "] has changed (was " + previousDep
+ + "). If it was included in the build as an overlay, " + "consider "
+ + "cleaning the target directory of the project (mvn clean)", "Dependency[" + dependency
+ + "] has changed (was " + previousDep + ").", true );
}
}
@@ -236,16 +237,16 @@
while ( it.hasNext() )
{
Artifact artifact = (Artifact) it.next();
- if ( artifact.getGroupId().equals( dependency.getGroupId() ) &&
- artifact.getArtifactId().equals( dependency.getArtifactId() ) &&
- artifact.getType().equals( dependency.getType() ) )
+ if ( artifact.getGroupId().equals( dependency.getGroupId() )
+ && artifact.getArtifactId().equals( dependency.getArtifactId() )
+ && artifact.getType().equals( dependency.getType() ) )
{
if ( artifact.getClassifier() == null && dependency.getClassifier() == null )
{
return artifact;
}
- else if ( dependency.getClassifier() != null &&
- dependency.getClassifier().equals( artifact.getClassifier() ) )
+ else if ( dependency.getClassifier() != null
+ && dependency.getClassifier().equals( artifact.getClassifier() ) )
{
return artifact;
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java?rev=682073&r1=682072&r2=682073&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java Sat Aug 2 15:32:18 2008
@@ -116,8 +116,8 @@
final File tmpDir = getOverlayTempDirectory( context, overlay );
// TODO: not sure it's good, we should reuse the markers of the dependency plugin
- if ( FileUtils.sizeOfDirectory( tmpDir ) == 0 ||
- overlay.getArtifact().getFile().lastModified() > tmpDir.lastModified() )
+ if ( FileUtils.sizeOfDirectory( tmpDir ) == 0
+ || overlay.getArtifact().getFile().lastModified() > tmpDir.lastModified() )
{
doUnpack( context, overlay.getArtifact().getFile(), tmpDir );
}
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=682073&r1=682072&r2=682073&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 2 15:32:18 2008
@@ -92,9 +92,9 @@
context.getLog().debug( "Dump of the current build pathSet content -->" );
for ( Iterator iterator = pathSet.iterator(); iterator.hasNext(); )
{
- context.getLog().debug(""+ iterator.next() );
+ context.getLog().debug( "" + iterator.next() );
}
- context.getLog().debug( "-- end of dump --");
+ context.getLog().debug( "-- end of dump --" );
handleDeploymentDescriptors( context, webinfDir, metainfDir );
@@ -153,7 +153,7 @@
else
if ( !context.getWebappSourceDirectory().getAbsolutePath().equals( context.getWebappDirectory().getPath() ) )
{
- context.getLog().info("Copying webapp resources[" + context.getWebappSourceDirectory() + "]");
+ context.getLog().info( "Copying webapp resources[" + context.getWebappSourceDirectory() + "]" );
final PathSet sources = getFilesToIncludes( context.getWebappSourceDirectory(),
context.getWebappSourceIncludes(),
context.getWebappSourceExcludes() );
@@ -246,7 +246,7 @@
if ( containerConfigXML != null && StringUtils.isNotEmpty( containerConfigXML.getName() ) )
{
String xmlFileName = containerConfigXML.getName();
- if (context.isFilteringDeploymentDescriptors())
+ if ( context.isFilteringDeploymentDescriptors() )
{
context.getMavenFileFilter().copyFile( containerConfigXML, new File( metainfDir, xmlFileName ),
true, context.getFilterWrappers(), null );
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java?rev=682073&r1=682072&r2=682073&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java Sat Aug 2 15:32:18 2008
@@ -1,5 +1,24 @@
package org.apache.maven.plugin.war.util;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.model.Dependency;
/**
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java?rev=682073&r1=682072&r2=682073&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/MappingUtils.java Sat Aug 2 15:32:18 2008
@@ -61,7 +61,7 @@
// FIXME: This is BAD! Accessors SHOULD NOT change the behavior of the object.
artifact.isSnapshot();
- RegexBasedInterpolator interpolator = new RegexBasedInterpolator("\\@\\{(", ")?([^}]+)\\}@");
+ RegexBasedInterpolator interpolator = new RegexBasedInterpolator( "\\@\\{(", ")?([^}]+)\\}@" );
interpolator.addValueSource( new ObjectBasedValueSource( artifact ) );
interpolator.addValueSource( new ObjectBasedValueSource( artifact.getArtifactHandler() ) );
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java?rev=682073&r1=682072&r2=682073&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java Sat Aug 2 15:32:18 2008
@@ -41,16 +41,16 @@
while ( it.hasNext() )
{
Artifact artifact = (Artifact) it.next();
- if ( artifact.getGroupId().equals( dependency.getGroupId() ) &&
- artifact.getArtifactId().equals( dependency.getArtifactId() ) &&
- artifact.getType().equals( dependency.getType() ) )
+ if ( artifact.getGroupId().equals( dependency.getGroupId() )
+ && artifact.getArtifactId().equals( dependency.getArtifactId() )
+ && artifact.getType().equals( dependency.getType() ) )
{
if ( artifact.getClassifier() == null && dependency.getClassifier() == null )
{
return artifact;
}
- else if ( dependency.getClassifier() != null &&
- dependency.getClassifier().equals( artifact.getClassifier() ) )
+ else if ( dependency.getClassifier() != null
+ && dependency.getClassifier().equals( artifact.getClassifier() ) )
{
return artifact;
}
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=682073&r1=682072&r2=682073&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 2 15:32:18 2008
@@ -383,10 +383,10 @@
{
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();
@@ -417,9 +417,9 @@
while ( it.hasNext() )
{
Dependency dep = (Dependency) it.next();
- if ( dependency.getGroupId().equals( dep.getGroupId() ) &&
- dependency.getArtifactId().equals( dep.getArtifactId() ) &&
- dependency.getType().equals( dep.getType() ) && (
+ 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() ) ) ) )
{