You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/06/12 13:49:45 UTC
svn commit: r1492159 -
/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
Author: olamy
Date: Wed Jun 12 11:49:45 2013
New Revision: 1492159
URL: http://svn.apache.org/r1492159
Log:
code format
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
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=1492159&r1=1492158&r2=1492159&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 Wed Jun 12 11:49:45 2013
@@ -302,27 +302,30 @@ public abstract class AbstractWarPackagi
}
else
{
- if(source.isDirectory())
+ if ( source.isDirectory() )
{
- context.getLog().warn( " + " + targetFilename + " is packaged from the source folder" );
+ context.getLog().warn( " + " + targetFilename + " is packaged from the source folder" );
- try {
- JarArchiver archiver = context.getJarArchiver();
- archiver.addDirectory(source);
- archiver.setDestFile(destination);
- archiver.createArchive();
- } catch (ArchiverException e) {
- String msg = "Failed to create " + targetFilename;
- context.getLog().error( msg, e );
- throw new RuntimeException(msg, e);
- }
+ try
+ {
+ JarArchiver archiver = context.getJarArchiver();
+ archiver.addDirectory( source );
+ archiver.setDestFile( destination );
+ archiver.createArchive();
+ }
+ catch ( ArchiverException e )
+ {
+ String msg = "Failed to create " + targetFilename;
+ context.getLog().error( msg, e );
+ throw new RuntimeException( msg, e );
+ }
}
else
{
- FileUtils.copyFile( source.getCanonicalFile(), destination );
- // preserve timestamp
- destination.setLastModified( source.lastModified() );
- context.getLog().debug( " + " + targetFilename + " has been copied." );
+ FileUtils.copyFile( source.getCanonicalFile(), destination );
+ // preserve timestamp
+ destination.setLastModified( source.lastModified() );
+ context.getLog().debug( " + " + targetFilename + " has been copied." );
}
return true;
}