You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/11/28 02:36:50 UTC
svn commit: r1414499 - in
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly:
archive/ artifact/ format/ io/ mojos/ utils/
Author: hboutemy
Date: Wed Nov 28 01:36:45 2012
New Revision: 1414499
URL: http://svn.apache.org/viewvc?rev=1414499&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java Wed Nov 28 01:36:45 2012
@@ -33,6 +33,7 @@ public interface AssemblyArchiver
{
String ROLE = AssemblyArchiver.class.getName();
- File createArchive(Assembly assembly, String fullName, String format, AssemblerConfigurationSource configSource, boolean recompressZippedFiles)
+ File createArchive( Assembly assembly, String fullName, String format, AssemblerConfigurationSource configSource,
+ boolean recompressZippedFiles )
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Wed Nov 28 01:36:45 2012
@@ -132,8 +132,8 @@ public class DefaultAssemblyArchiver
* top-level section of the assembly descriptor, if that section is present.</li>
* </ol>
*/
- public File createArchive(final Assembly assembly, final String fullName, final String format,
- final AssemblerConfigurationSource configSource, boolean recompressZippedFiles)
+ public File createArchive( final Assembly assembly, final String fullName, final String format,
+ final AssemblerConfigurationSource configSource, boolean recompressZippedFiles )
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
validate( assembly );
@@ -168,7 +168,8 @@ public class DefaultAssemblyArchiver
selectContainerDescriptorHandlers( assembly.getContainerDescriptorHandlers(), configSource );
final Archiver archiver =
- createArchiver( format, assembly.isIncludeBaseDirectory(), basedir, configSource, containerHandlers, recompressZippedFiles);
+ createArchiver( format, assembly.isIncludeBaseDirectory(), basedir, configSource, containerHandlers,
+ recompressZippedFiles );
archiver.setDestFile( destFile );
@@ -176,10 +177,8 @@ public class DefaultAssemblyArchiver
dependencyResolver.resolve( assembly, configSource, context );
- for ( final Iterator<AssemblyArchiverPhase> phaseIterator = assemblyPhases.iterator(); phaseIterator.hasNext(); )
+ for ( AssemblyArchiverPhase phase : assemblyPhases )
{
- final AssemblyArchiverPhase phase = phaseIterator.next();
-
phase.execute( assembly, archiver, configSource, context );
}
@@ -286,9 +285,10 @@ public class DefaultAssemblyArchiver
* @throws org.codehaus.plexus.archiver.ArchiverException
* @throws org.codehaus.plexus.archiver.manager.NoSuchArchiverException
*/
- protected Archiver createArchiver(final String format, final boolean includeBaseDir, final String finalName,
- final AssemblerConfigurationSource configSource,
- final List<ContainerDescriptorHandler> containerHandlers, boolean recompressZippedFiles)
+ protected Archiver createArchiver( final String format, final boolean includeBaseDir, final String finalName,
+ final AssemblerConfigurationSource configSource,
+ final List<ContainerDescriptorHandler> containerHandlers,
+ boolean recompressZippedFiles )
throws ArchiverException, NoSuchArchiverException
{
Archiver archiver;
@@ -305,9 +305,9 @@ public class DefaultAssemblyArchiver
archiver = archiverManager.getArchiver( format );
}
- if (archiver instanceof AbstractZipArchiver)
+ if ( archiver instanceof AbstractZipArchiver )
{
- ((AbstractZipArchiver)archiver).setRecompressAddedZips(recompressZippedFiles);
+ ( (AbstractZipArchiver) archiver ).setRecompressAddedZips( recompressZippedFiles );
}
final List<FileSelector> extraSelectors = new ArrayList<FileSelector>();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java Wed Nov 28 01:36:45 2012
@@ -19,12 +19,9 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.AssemblyContext;
import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.project.MavenProject;
/**
* Convenience component that aids in the resolution of dependency artifacts, according to various configurations such
@@ -37,28 +34,7 @@ public interface DependencyResolver
/**
* Resolve the project dependencies, according to the supplied configuration.
- *
- * @param project
- * The project whose dependencies should be resolved
- * @param scope
- * The dependency scope to resolve
- * @param managedVersions
- * The map of managed versions, which allows dependency version conflict resolution to happen once for
- * the entire assembly process.
- * @param localRepository
- * The local repository which acts as a local cache for remote artifact repositories
- * @param remoteRepositories
- * The list of remote {@link ArtifactRepository} instances to use during resolution, in addition to those
- * defined in the supplied {@link MavenProject} instance.
- * @param resolveTransitively
- * If true, resolve project dependencies transitively; if false, only resolve the project's direct
- * dependencies.
- * @return The set of resolved {@link Artifact} instances for the project
*/
- // Set<Artifact> resolveDependencies( MavenProject project, String scope, ArtifactRepository localRepository,
- // List<ArtifactRepository> remoteRepositories, boolean resolveTransitively )
- // throws InvalidDependencyVersionException, ArtifactResolutionException, ArtifactNotFoundException;
-
void resolve( Assembly assembly, AssemblerConfigurationSource configSource, AssemblyContext context )
throws DependencyResolutionException;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileFormatter.java Wed Nov 28 01:36:45 2012
@@ -74,7 +74,9 @@ public class FileFormatter
}
if ( filter )
+ {
result = doFileFilter( source, tempRoot, encoding, configSource.getEscapeString() );
+ }
String lineEndingChars = AssemblyFileUtils.getLineEndingCharacters( lineEnding );
if ( lineEndingChars != null )
@@ -103,7 +105,7 @@ public class FileFormatter
return target;
}
- catch (MavenFilteringException e)
+ catch ( MavenFilteringException e )
{
throw new AssemblyFormattingException( "Error filtering file '" + source + "': " + e.getMessage(), e );
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/FileSetFormatter.java Wed Nov 28 01:36:45 2012
@@ -58,7 +58,7 @@ public class FileSetFormatter
FileSet fileSet = new FileSet();
fileSet.setLineEnding( lineEnding );
- fileSet.setDirectory(fileSetDir.getAbsolutePath());
+ fileSet.setDirectory( fileSetDir.getAbsolutePath() );
fileSet.setIncludes( set.getIncludes() );
@@ -97,7 +97,9 @@ public class FileSetFormatter
File sourceFile = new File( fileSetDir, file );
try
{
- sourceFile = fileFormatter.format( sourceFile, set.isFiltered(), lineEndingHint, formattedDir, configSource.getEncoding() );
+ sourceFile =
+ fileFormatter.format( sourceFile, set.isFiltered(), lineEndingHint, formattedDir,
+ configSource.getEncoding() );
AssemblyFileUtils.copyFile( sourceFile, targetFile );
}
catch ( AssemblyFormattingException e )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java Wed Nov 28 01:36:45 2012
@@ -33,16 +33,16 @@ import java.util.List;
public interface AssemblyReader
{
- public List<Assembly> readAssemblies( AssemblerConfigurationSource configSource )
+ List<Assembly> readAssemblies( AssemblerConfigurationSource configSource )
throws AssemblyReadException, InvalidAssemblerConfigurationException;
- public Assembly getAssemblyForDescriptorReference( String ref, AssemblerConfigurationSource configSource )
+ Assembly getAssemblyForDescriptorReference( String ref, AssemblerConfigurationSource configSource )
throws AssemblyReadException, InvalidAssemblerConfigurationException;
- public Assembly getAssemblyFromDescriptorFile( File file, AssemblerConfigurationSource configSource )
+ Assembly getAssemblyFromDescriptorFile( File file, AssemblerConfigurationSource configSource )
throws AssemblyReadException, InvalidAssemblerConfigurationException;
- public void includeSiteInAssembly( Assembly assembly, AssemblerConfigurationSource configSource )
+ void includeSiteInAssembly( Assembly assembly, AssemblerConfigurationSource configSource )
throws MojoFailureException, InvalidAssemblerConfigurationException;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java Wed Nov 28 01:36:45 2012
@@ -39,8 +39,6 @@ import java.util.Properties;
import java.util.Set;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugin.assembly.interpolation.AssemblyExpressionEvaluator;
@@ -448,8 +446,6 @@ public class DefaultAssemblyReader
* @param assembly
* @param assemblyDir
* @throws AssemblyReadException
- * @throws MojoFailureException
- * @throws MojoExecutionException
*/
protected void mergeComponentsWithMainAssembly( final Assembly assembly, final File assemblyDir,
final AssemblerConfigurationSource configSource )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Wed Nov 28 01:36:45 2012
@@ -428,12 +428,13 @@ public abstract class AbstractAssemblyMo
}
if ( effectiveFormats == null || effectiveFormats.size() == 0 )
{
- throw new MojoFailureException( "No formats specified in the execution parameters or the assembly descriptor.");
+ throw new MojoFailureException( "No formats specified in the execution parameters or the assembly descriptor." );
}
for ( final String format : effectiveFormats )
{
- final File destFile = assemblyArchiver.createArchive( assembly, fullName, format, this, isRecompressZippedFiles());
+ final File destFile =
+ assemblyArchiver.createArchive( assembly, fullName, format, this, isRecompressZippedFiles() );
final MavenProject project = getProject();
final String classifier = getClassifier();
@@ -852,15 +853,18 @@ public abstract class AbstractAssemblyMo
return ignorePermissions;
}
- public String getEncoding() {
+ public String getEncoding()
+ {
return encoding;
}
- protected boolean isRecompressZippedFiles() {
+ protected boolean isRecompressZippedFiles()
+ {
return recompressZippedFiles;
}
- public String getEscapeString() {
- return escapeString;
+ public String getEscapeString()
+ {
+ return escapeString;
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java Wed Nov 28 01:36:45 2012
@@ -29,7 +29,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.io.AssemblyReader;
import org.apache.maven.plugin.assembly.model.Assembly;
-import java.util.Iterator;
import java.util.List;
/**
@@ -59,9 +58,8 @@ public abstract class AbstractDirectoryM
throw new MojoFailureException( reader, e.getMessage(), "Mojo configuration is invalid: " + e.getMessage() );
}
- for ( final Iterator<Assembly> i = assemblies.iterator(); i.hasNext(); )
+ for ( Assembly assembly : assemblies )
{
- final Assembly assembly = i.next();
createDirectory( assembly );
}
}
@@ -84,7 +82,7 @@ public abstract class AbstractDirectoryM
try
{
- archiver.createArchive( assembly, fullName, "dir", this, isRecompressZippedFiles());
+ archiver.createArchive( assembly, fullName, "dir", this, isRecompressZippedFiles() );
}
catch ( final ArchiveCreationException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java?rev=1414499&r1=1414498&r2=1414499&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java Wed Nov 28 01:36:45 2012
@@ -97,7 +97,7 @@ public final class AssemblyFileUtils
public static void verifyTempDirectoryAvailability( final File tempDir, final Logger logger )
{
- if (!tempDir.exists())
+ if ( !tempDir.exists() )
{
tempDir.mkdirs();
}
@@ -209,7 +209,8 @@ public final class AssemblyFileUtils
return value;
}
- public static void copyFile( File src, File dst ) throws IOException
+ public static void copyFile( File src, File dst )
+ throws IOException
{
FileChannel c1 = new RandomAccessFile( src, "r" ).getChannel();
FileChannel c2 = new RandomAccessFile( dst, "rw" ).getChannel();