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:12:10 UTC
svn commit: r985593 - in
/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war:
./ overlay/ packaging/ util/
Author: dennisl
Date: Sat Aug 14 22:12:09 2010
New Revision: 985593
URL: http://svn.apache.org/viewvc?rev=985593&view=rev
Log:
o Add some whitespace into log and exception messages.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
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/ClassesPackagingTask.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/WebappStructure.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=985593&r1=985592&r2=985593&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Sat Aug 14 22:12:09 2010
@@ -436,7 +436,7 @@ public abstract class AbstractWarMojo
}
final long startTime = System.currentTimeMillis();
- getLog().info( "Assembling webapp[" + project.getArtifactId() + "] in [" + webappDirectory + "]" );
+ getLog().info( "Assembling webapp [" + project.getArtifactId() + "] in [" + webappDirectory + "]" );
final OverlayManager overlayManager =
new OverlayManager( overlays, project, dependentWarIncludes, dependentWarExcludes, currentProjectOverlay );
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java?rev=985593&r1=985592&r2=985593&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java Sat Aug 14 22:12:09 2010
@@ -36,7 +36,7 @@ public class WarInPlaceMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- getLog().info( "Generating webapp in source directory[" + getWarSourceDirectory() + "]" );
+ getLog().info( "Generating webapp in source directory [" + getWarSourceDirectory() + "]" );
buildExplodedWebapp( getWarSourceDirectory() );
}
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=985593&r1=985592&r2=985593&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 14 22:12:09 2010
@@ -224,7 +224,7 @@ public class OverlayManager
}
}
throw new InvalidOverlayConfigurationException(
- "overlay[" + overlay + "] is not a dependency of the project." );
+ "overlay [" + overlay + "] is not a dependency of the project." );
}
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=985593&r1=985592&r2=985593&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 14 22:12:09 2010
@@ -160,13 +160,13 @@ public abstract class AbstractWarPackagi
throws IOException
{
context.getLog().debug( " - " + targetFilename + " wasn't copied because it has "
- + "already been packaged for overlay[" + actualOwnerId + "]." );
+ + "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
+ context.getLog().info( "File [" + targetFilename + "] belonged to overlay [" + deprecatedOwnerId
+ "] so it will be overwritten." );
copyFile( context, file, targetFile, targetFilename, false );
}
@@ -175,7 +175,7 @@ public abstract class AbstractWarPackagi
throws IOException
{
context.getLog()
- .warn( "File[" + targetFilename + "] belonged to overlay[" + unknownOwnerId
+ .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 );
@@ -253,13 +253,13 @@ public abstract class AbstractWarPackagi
}
catch ( ArchiverException e )
{
- throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to["
+ 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=985593&r1=985592&r2=985593&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 14 22:12:09 2010
@@ -107,22 +107,22 @@ public class ArtifactsPackagingTask
else if ( "war".equals( type ) )
{
// Nothing to do here, it is an overlay and it's already handled
- context.getLog().debug( "war artifacts are handled as overlays, ignoring[" + artifact + "]" );
+ context.getLog().debug( "war artifacts are handled as overlays, ignoring [" + artifact + "]" );
}
else if ( "zip".equals( type ) )
{
// Nothing to do here, it is an overlay and it's already handled
- context.getLog().debug( "zip artifacts are handled as overlays, ignoring[" + artifact + "]" );
+ context.getLog().debug( "zip artifacts are handled as overlays, ignoring [" + artifact + "]" );
}
else
{
context.getLog().debug(
- "Artifact of type[" + type + "] is not supported, ignoring[" + artifact + "]" );
+ "Artifact of type [" + type + "] is not supported, ignoring [" + artifact + "]" );
}
}
catch ( IOException e )
{
- throw new MojoExecutionException( "Failed to copy file for artifact[" + artifact + "]", e );
+ throw new MojoExecutionException( "Failed to copy file for artifact [" + artifact + "]", e );
}
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java?rev=985593&r1=985592&r2=985593&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java Sat Aug 14 22:12:09 2010
@@ -78,7 +78,7 @@ public class ClassesPackagingTask
catch ( IOException e )
{
throw new MojoExecutionException(
- "Could not copy webapp classes[" + context.getClassesDirectory().getAbsolutePath() + "]", e );
+ "Could not copy webapp classes [" + context.getClassesDirectory().getAbsolutePath() + "]", e );
}
}
}
@@ -99,7 +99,7 @@ public class ClassesPackagingTask
catch ( InterpolationException e )
{
throw new MojoExecutionException(
- "Could not get the final name of the artifact[" + artifact.getGroupId() + ":" + artifact.getArtifactId()
+ "Could not get the final name of the artifact [" + artifact.getGroupId() + ":" + artifact.getArtifactId()
+ ":" + artifact.getVersion() + "]", e );
}
final String targetFilename = LIB_PATH + archiveName;
@@ -115,7 +115,7 @@ public class ClassesPackagingTask
else
{
context.getLog().warn(
- "Could not generate archive classes file[" + targetFilename + "] has already been copied." );
+ "Could not generate archive classes file [" + targetFilename + "] has already been copied." );
}
}
}
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=985593&r1=985592&r2=985593&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 14 22:12:09 2010
@@ -122,21 +122,21 @@ public class DependenciesAnalysisPackagi
// now remove
if ( targetFile == null )
{
- context.getLog().error( "Could not get file from dependency[" + dependency + "]" );
+ context.getLog().error( "Could not get file from dependency [" + dependency + "]" );
}
else if ( targetFile.exists() )
{
- context.getLog().debug( "Removing file[" + targetFile.getAbsolutePath() + "]" );
+ context.getLog().debug( "Removing file [" + targetFile.getAbsolutePath() + "]" );
targetFile.delete();
}
else
{
- context.getLog().warn( "File to remove[" + targetFile.getAbsolutePath() + "] has not been found" );
+ context.getLog().warn( "File to remove [" + targetFile.getAbsolutePath() + "] has not been found" );
}
}
else
{
- context.getLog().warn( "Could not retrieve the target file name of dependency[" + dependency + "]" );
+ context.getLog().warn( "Could not retrieve the target file name of dependency [" + dependency + "]" );
}
}
@@ -153,33 +153,33 @@ public class DependenciesAnalysisPackagi
public void unchangedDependency( Dependency dependency )
{
- context.getLog().debug( "Dependency[" + dependency + "] has not changed since last build." );
+ context.getLog().debug( "Dependency [" + dependency + "] has not changed since last build." );
}
public void newDependency( Dependency dependency )
{
- context.getLog().debug( "New dependency[" + dependency + "]." );
+ context.getLog().debug( "New dependency [" + dependency + "]." );
}
public void removedDependency( Dependency dependency )
{
- handleDependency( context, dependency, "Dependency[" + dependency
- + "] has been removed from the project but it was not bundled anyway.", "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
+ + "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 ("
+ handleDependency( context, dependency, "Version of dependency [" + dependency + "] has changed ("
+ previousVersion + " -> " + dependency.getVersion() + ") but it was not bundled anyway.",
- "Version of dependency[" + dependency + "] has changed ("
+ "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 ("
+ "Version of dependency [" + dependency + "] has changed ("
+ previousVersion + " -> " + dependency.getVersion() + ").",
true );
}
@@ -192,10 +192,10 @@ public class DependenciesAnalysisPackagi
&& !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 ("
+ 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["
+ + "consider cleaning the target directory of the project (mvn clean)", "Scope of dependency ["
+ dependency + "] has changed (" + previousScope + " -> " + dependency.getScope() + ").", true );
}
@@ -208,11 +208,11 @@ public class DependenciesAnalysisPackagi
{
// 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
+ "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", true );
+ "Dependency [" + dependency + "] is now optional", true );
}
@@ -220,10 +220,10 @@ public class DependenciesAnalysisPackagi
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
+ 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
+ + "cleaning the target directory of the project (mvn clean)", "Dependency [" + dependency
+ "] has changed (was " + previousDep + ").", true );
}
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=985593&r1=985592&r2=985593&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 14 22:12:09 2010
@@ -61,13 +61,13 @@ public class OverlayPackagingTask
"OverlayPackagingTask performPackaging overlay.getTargetPath() " + overlay.getTargetPath() );
if ( overlay.shouldSkip() )
{
- context.getLog().info( "Skipping overlay[" + overlay + "]" );
+ context.getLog().info( "Skipping overlay [" + overlay + "]" );
}
else
{
try
{
- context.getLog().info( "Processing overlay[" + overlay + "]" );
+ context.getLog().info( "Processing overlay [" + overlay + "]" );
// Step1: Extract if necessary
final File tmpDir = unpackOverlay( context, overlay );
@@ -94,7 +94,7 @@ public class OverlayPackagingTask
}
catch ( IOException e )
{
- throw new MojoExecutionException( "Failed to copy file for overlay[" + overlay + "]", e );
+ throw new MojoExecutionException( "Failed to copy file for overlay [" + overlay + "]", e );
}
}
}
@@ -123,7 +123,7 @@ public class OverlayPackagingTask
}
else
{
- context.getLog().debug( "Overlay[" + overlay + "] was already unpacked" );
+ context.getLog().debug( "Overlay [" + overlay + "] was already unpacked" );
}
return 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=985593&r1=985592&r2=985593&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:12:09 2010
@@ -136,7 +136,7 @@ public class WarProjectPackagingTask
}
catch ( IOException e )
{
- throw new MojoExecutionException( "Could not copy resource[" + resource.getDirectory() + "]", e );
+ throw new MojoExecutionException( "Could not copy resource [" + resource.getDirectory() + "]", e );
}
}
}
@@ -158,7 +158,7 @@ public class WarProjectPackagingTask
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() );
@@ -170,7 +170,7 @@ public class WarProjectPackagingTask
catch ( IOException e )
{
throw new MojoExecutionException(
- "Could not copy webapp sources[" + context.getWebappDirectory().getAbsolutePath() + "]", e );
+ "Could not copy webapp sources [" + context.getWebappDirectory().getAbsolutePath() + "]", e );
}
}
}
@@ -308,11 +308,11 @@ public class WarProjectPackagingTask
if ( !context.getWebappDirectory().exists() )
{
context.getLog().warn(
- "Not copying webapp webResources[" + resource.getDirectory() + "]: webapp directory["
+ "Not copying webapp webResources [" + resource.getDirectory() + "]: webapp directory ["
+ context.getWebappDirectory().getAbsolutePath() + "] does not exist!" );
}
- context.getLog().info( "Copying webapp webResources[" + resource.getDirectory() + "] to["
+ context.getLog().info( "Copying webapp webResources [" + resource.getDirectory() + "] to ["
+ context.getWebappDirectory().getAbsolutePath() + "]" );
String[] fileNames = getFilesToCopy( resource );
for ( int i = 0; i < fileNames.length; i++ )
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=985593&r1=985592&r2=985593&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:12:09 2010
@@ -253,7 +253,7 @@ public class WebappStructure
}
throw new IllegalStateException(
- "Should not happen, path[" + path + "] is flagged as being registered but was not found." );
+ "Should not happen, path [" + path + "] is flagged as being registered but was not found." );
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java?rev=985593&r1=985592&r2=985593&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java Sat Aug 14 22:12:09 2010
@@ -100,12 +100,12 @@ public class WebappStructureSerializer
if ( !targetFile.getParentFile().exists() && !targetFile.getParentFile().mkdirs() )
{
throw new IOException(
- "Could not create parent[" + targetFile.getParentFile().getAbsolutePath() + "]" );
+ "Could not create parent [" + targetFile.getParentFile().getAbsolutePath() + "]" );
}
if ( !targetFile.exists() && !targetFile.createNewFile() )
{
- throw new IOException( "Could not create file[" + targetFile.getAbsolutePath() + "]" );
+ throw new IOException( "Could not create file [" + targetFile.getAbsolutePath() + "]" );
}
writer = WriterFactory.newXmlWriter( targetFile );
xStream.toXML( webappStructure, writer );