Author: krosenvold
Date: Thu Nov 13 18:08:07 2014
New Revision: 1639422
URL: http://svn.apache.org/r1639422
Log:
Reformatted to code style
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java
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/archive/ManifestCreationFinalizer.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.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/artifact/ResolutionManagementInfo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.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/mojos/AssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AttachedAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStream.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
Thu Nov 13 18:08:07 2014
@@ -178,6 +178,7 @@ public interface AssemblerConfigurationS
/**
* Maven shared filtering utility.
+ *
* @ return the maven reader filter
*/
MavenReaderFilter getMavenReaderFilter();
@@ -212,13 +213,21 @@ public interface AssemblerConfigurationS
*/
List<String> getDelimiters();
- @Nonnull FixedStringSearchInterpolator getRepositoryInterpolator();
+ @Nonnull
+ FixedStringSearchInterpolator getRepositoryInterpolator();
- /** Gets an interpolator from environment variables and stuff */
- @Nonnull FixedStringSearchInterpolator getCommandLinePropsInterpolator();
+ /**
+ * Gets an interpolator from environment variables and stuff
+ */
+ @Nonnull
+ FixedStringSearchInterpolator getCommandLinePropsInterpolator();
- /** Gets an interpolator from environment variables and stuff */
- @Nonnull FixedStringSearchInterpolator getEnvInterpolator();
+ /**
+ * Gets an interpolator from environment variables and stuff
+ */
+ @Nonnull
+ FixedStringSearchInterpolator getEnvInterpolator();
- @Nonnull FixedStringSearchInterpolator getMainProjectInterpolator();
+ @Nonnull
+ FixedStringSearchInterpolator getMainProjectInterpolator();
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java
Thu Nov 13 18:08:07 2014
@@ -30,7 +30,7 @@ public class InvalidAssemblerConfigurati
/**
* @param message The message.
- * @param error The error
+ * @param error The error
*/
public InvalidAssemblerConfigurationException( final String message, final
Throwable error )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java
Thu Nov 13 18:08:07 2014
@@ -30,8 +30,9 @@ public class ArchiveCreationException
/**
* Create in instance.
+ *
* @param message The message to use.
- * @param error The error.
+ * @param error The error.
*/
public ArchiveCreationException( final String message, final Throwable
error )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java
Thu Nov 13 18:08:07 2014
@@ -30,7 +30,7 @@ public class ArchiveExpansionException
/**
* @param message The message to use for this instance.
- * @param error The error which has been thrown.
+ * @param error The error which has been thrown.
*/
public ArchiveExpansionException( final String message, final Throwable
error )
{
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=1639422&r1=1639421&r2=1639422&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
Thu Nov 13 18:08:07 2014
@@ -46,14 +46,15 @@ public interface AssemblyArchiver
* instances, executing each to handle a different
* top-level section of the assembly descriptor, if that section is
present.</li>
* </ol>
- * @param assembly The {@link Assembly}
- * @param fullName The full name.
- * @param format The format.
- * @param configSource The {@link AssemblerConfigurationSource}
+ *
+ * @param assembly The {@link Assembly}
+ * @param fullName The full name.
+ * @param format The format.
+ * @param configSource The {@link AssemblerConfigurationSource}
* @param recompressZippedFiles recompress zipped files.
* @return The resulting archive file.
- * @throws ArchiveCreationException when creation fails
- * @throws AssemblyFormattingException when formatting fails
+ * @throws ArchiveCreationException when creation fails
+ * @throws AssemblyFormattingException when formatting fails
* @throws InvalidAssemblerConfigurationException when the configurationis
bad
*/
File createArchive( Assembly assembly, String fullName, String format,
AssemblerConfigurationSource configSource,
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=1639422&r1=1639421&r2=1639422&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
Thu Nov 13 18:08:07 2014
@@ -80,7 +80,7 @@ import java.util.Map;
* locating and configuring {@link Archiver} instances, executing multiple
{@link AssemblyArchiverPhase} instances to
* interpret the various sections of the assembly descriptor and determine
which files to add, and other associated
* activities.
- *
+ *
* @version $Id$
*/
@Component( role = AssemblyArchiver.class )
@@ -107,23 +107,28 @@ public class DefaultAssemblyArchiver
}
// introduced for testing.
+
/**
* @param archiverManager The archive manager.
- * @param assemblyPhases The list of {@link AssemblyArchiverPhase}
+ * @param assemblyPhases The list of {@link AssemblyArchiverPhase}
*/
- protected DefaultAssemblyArchiver( final ArchiverManager archiverManager,
final List<AssemblyArchiverPhase> assemblyPhases )
+ protected DefaultAssemblyArchiver( final ArchiverManager archiverManager,
+ final List<AssemblyArchiverPhase>
assemblyPhases )
{
this.archiverManager = archiverManager;
this.assemblyPhases = assemblyPhases;
}
- private List<AssemblyArchiverPhase> sortedPhases(){
+ private List<AssemblyArchiverPhase> sortedPhases()
+ {
List<AssemblyArchiverPhase> sorted = new
ArrayList<AssemblyArchiverPhase>( assemblyPhases );
Collections.sort( sorted, new AssemblyArchiverPhaseComparator() );
return sorted;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public File createArchive( final Assembly assembly, final String fullName,
final String format,
final AssemblerConfigurationSource
configSource, boolean recompressZippedFiles )
throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
@@ -151,11 +156,11 @@ public class DefaultAssemblyArchiver
if ( specifiedBasedir != null )
{
- basedir =
- AssemblyFormatUtils.getOutputDirectory( specifiedBasedir,
finalName, configSource,
-
AssemblyFormatUtils.moduleProjectInterpolator(
-
configSource.getProject() ),
-
AssemblyFormatUtils.artifactProjectInterpolator( null ) );
+ basedir = AssemblyFormatUtils.getOutputDirectory(
specifiedBasedir, finalName, configSource,
+
AssemblyFormatUtils.moduleProjectInterpolator(
+
configSource.getProject() ),
+
AssemblyFormatUtils.artifactProjectInterpolator(
+ null ) );
}
final List<ContainerDescriptorHandler> containerHandlers =
@@ -176,23 +181,24 @@ public class DefaultAssemblyArchiver
}
catch ( final ArchiverException e )
{
- throw new ArchiveCreationException( "Error creating assembly
archive " + assembly.getId() + ": "
- + e.getMessage(), e );
+ throw new ArchiveCreationException(
+ "Error creating assembly archive " + assembly.getId() + ": " +
e.getMessage(), e );
}
catch ( final IOException e )
{
- throw new ArchiveCreationException( "Error creating assembly
archive " + assembly.getId() + ": "
- + e.getMessage(), e );
+ throw new ArchiveCreationException(
+ "Error creating assembly archive " + assembly.getId() + ": " +
e.getMessage(), e );
}
catch ( final NoSuchArchiverException e )
{
- throw new ArchiveCreationException( "Unable to obtain archiver for
extension '" + format
- + "', for assembly: '" + assembly.getId() + "'", e );
+ throw new ArchiveCreationException(
+ "Unable to obtain archiver for extension '" + format + "', for
assembly: '" + assembly.getId() + "'",
+ e );
}
catch ( final DependencyResolutionException e )
{
- throw new ArchiveCreationException( "Unable to resolve
dependencies for assembly '" + assembly.getId()
- + "'", e );
+ throw new ArchiveCreationException(
+ "Unable to resolve dependencies for assembly '" +
assembly.getId() + "'", e );
}
return destFile;
@@ -208,14 +214,15 @@ public class DefaultAssemblyArchiver
}
// CHECKSTYLE_OFF: LineLength
- private List<ContainerDescriptorHandler>
selectContainerDescriptorHandlers( List<ContainerDescriptorHandlerConfig>
requestedContainerDescriptorHandlers,
-
final AssemblerConfigurationSource configSource )
+ private List<ContainerDescriptorHandler> selectContainerDescriptorHandlers(
+ List<ContainerDescriptorHandlerConfig>
requestedContainerDescriptorHandlers,
+ final AssemblerConfigurationSource configSource )
throws InvalidAssemblerConfigurationException
// CHECKSTYLE_ON: LineLength
{
- getLogger().debug( "All known ContainerDescriptorHandler components: "
- + ( containerDescriptorHandlers == null ?
"none; map is null." : ""
- + containerDescriptorHandlers.keySet() ) );
+ getLogger().debug( "All known ContainerDescriptorHandler components: "
+ ( containerDescriptorHandlers == null
+ ? "none; map is null."
+ : "" + containerDescriptorHandlers.keySet() ) );
if ( requestedContainerDescriptorHandlers == null )
{
@@ -235,12 +242,11 @@ public class DefaultAssemblyArchiver
if ( handler == null )
{
throw new InvalidAssemblerConfigurationException(
- "Cannot
find ContainerDescriptorHandler with hint: "
- +
hint );
+ "Cannot find ContainerDescriptorHandler with hint: " +
hint );
}
- getLogger().debug( "Found container descriptor handler with
hint: " + hint + " (component: " + handler
- + ")" );
+ getLogger().debug(
+ "Found container descriptor handler with hint: " + hint +
" (component: " + handler + ")" );
if ( config.getConfiguration() != null )
{
@@ -265,11 +271,11 @@ public class DefaultAssemblyArchiver
/**
* Creates the necessary archiver to build the distribution file.
*
- * @param format Archive format
- * @param includeBaseDir the base directory for include.
- * @param finalName The final name.
- * @param configSource {@link AssemblerConfigurationSource}
- * @param containerHandlers The list of {@link ContainerDescriptorHandler}
+ * @param format Archive format
+ * @param includeBaseDir the base directory for include.
+ * @param finalName The final name.
+ * @param configSource {@link AssemblerConfigurationSource}
+ * @param containerHandlers The list of {@link
ContainerDescriptorHandler}
* @param recompressZippedFiles recompress zipped files.
* @return archiver Archiver generated
* @throws org.codehaus.plexus.archiver.ArchiverException
@@ -306,9 +312,9 @@ public class DefaultAssemblyArchiver
{
extraSelectors.add( new JarSecurityFileSelector() );
- extraFinalizers.add( new ManifestCreationFinalizer(
configSource.getMavenSession(),
-
configSource.getProject(),
-
configSource.getJarArchiveConfiguration() ) );
+ extraFinalizers.add(
+ new ManifestCreationFinalizer( configSource.getMavenSession(),
configSource.getProject(),
+
configSource.getJarArchiveConfiguration() ) );
}
@@ -323,9 +329,9 @@ public class DefaultAssemblyArchiver
prefix = finalName;
}
- archiver =
- new AssemblyProxyArchiver( prefix, archiver, containerHandlers,
extraSelectors, extraFinalizers,
- configSource.getWorkingDirectory(),
getLogger(), configSource.isDryRun() );
+ archiver = new AssemblyProxyArchiver( prefix, archiver,
containerHandlers, extraSelectors, extraFinalizers,
+
configSource.getWorkingDirectory(), getLogger(),
+ configSource.isDryRun() );
archiver.setUseJvmChmod( configSource.isUpdateOnly() );
archiver.setIgnorePermissions( configSource.isIgnorePermissions() );
@@ -346,13 +352,13 @@ public class DefaultAssemblyArchiver
}
catch ( final ComponentConfigurationException e )
{
- throw new InvalidAssemblerConfigurationException( "Failed to
configure handler: "
- + handler.getClass().getName(), e );
+ throw new InvalidAssemblerConfigurationException(
+ "Failed to configure handler: " +
handler.getClass().getName(), e );
}
catch ( final ComponentLookupException e )
{
- throw new InvalidAssemblerConfigurationException( "Failed to
lookup configurator for setup of handler: "
- + handler.getClass().getName(), e );
+ throw new InvalidAssemblerConfigurationException(
+ "Failed to lookup configurator for setup of handler: " +
handler.getClass().getName(), e );
}
getLogger().debug( "-- end configuration --" );
@@ -368,14 +374,12 @@ public class DefaultAssemblyArchiver
}
catch ( final XmlPullParserException e )
{
- throw new ArchiverException(
- "Failed to parse archiver
configuration for: " + archiver.getClass().getName(),
+ throw new ArchiverException( "Failed to parse archiver
configuration for: " + archiver.getClass().getName(),
e );
}
catch ( final IOException e )
{
- throw new ArchiverException(
- "Failed to parse archiver
configuration for: " + archiver.getClass().getName(),
+ throw new ArchiverException( "Failed to parse archiver
configuration for: " + archiver.getClass().getName(),
e );
}
@@ -391,8 +395,8 @@ public class DefaultAssemblyArchiver
}
catch ( final ComponentLookupException e )
{
- throw new ArchiverException( "Failed to lookup configurator for
setup of archiver: "
- + archiver.getClass().getName(), e );
+ throw new ArchiverException(
+ "Failed to lookup configurator for setup of archiver: " +
archiver.getClass().getName(), e );
}
getLogger().debug( "-- end configuration --" );
@@ -454,7 +458,7 @@ public class DefaultAssemblyArchiver
try
{
final Method getContainerRealm = container.getClass().getMethod(
"getContainerRealm" );
- return new Object[] { getContainerRealm.invoke( container ),
getContainerRealm.getReturnType() };
+ return new Object[]{ getContainerRealm.invoke( container ),
getContainerRealm.getReturnType() };
}
catch ( final NoSuchMethodException e )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
Thu Nov 13 18:08:07 2014
@@ -70,7 +70,8 @@ public class ManifestCreationFinalizer
}
@Override
- public void finalizeArchiveCreation( final Archiver archiver ) throws
ArchiverException
+ public void finalizeArchiveCreation( final Archiver archiver )
+ throws ArchiverException
{
if ( archiveConfiguration != null )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
Thu Nov 13 18:08:07 2014
@@ -943,7 +943,7 @@ public class AssemblyProxyArchiver
public void addResource( final PlexusIoResource resource, final String
destFileName, final int permissions )
throws ArchiverException
{
- File file = new File(resource.getName()); // zOMG.
+ File file = new File( resource.getName() ); // zOMG.
if ( acceptFile( file ) )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java
Thu Nov 13 18:08:07 2014
@@ -19,14 +19,14 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import static
org.apache.maven.plugin.assembly.archive.archiver.PrefixedFileSet.combineSelectors;
-
import org.codehaus.plexus.archiver.ArchivedFileSet;
import org.codehaus.plexus.components.io.fileselectors.FileSelector;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
import java.io.File;
+import static
org.apache.maven.plugin.assembly.archive.archiver.PrefixedFileSet.combineSelectors;
+
/**
* @version $Id$
*/
@@ -41,9 +41,9 @@ class PrefixedArchivedFileSet
private final FileSelector[] selectors;
/**
- * @param fileSet The archived file set.
+ * @param fileSet The archived file set.
* @param rootPrefix The root prefix.
- * @param selectors The file selectors.
+ * @param selectors The file selectors.
*/
public PrefixedArchivedFileSet( ArchivedFileSet fileSet, String
rootPrefix, FileSelector[] selectors )
{
@@ -60,31 +60,41 @@ class PrefixedArchivedFileSet
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public File getArchive()
{
return fileSet.getArchive();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String[] getExcludes()
{
return fileSet.getExcludes();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public FileSelector[] getFileSelectors()
{
return combineSelectors( fileSet.getFileSelectors(), selectors );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String[] getIncludes()
{
return fileSet.getIncludes();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getPrefix()
{
String prefix = fileSet.getPrefix();
@@ -103,19 +113,25 @@ class PrefixedArchivedFileSet
return rootPrefix + prefix;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isCaseSensitive()
{
return fileSet.isCaseSensitive();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isIncludingEmptyDirectories()
{
return fileSet.isIncludingEmptyDirectories();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isUsingDefaultExcludes()
{
return fileSet.isUsingDefaultExcludes();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java
Thu Nov 13 18:08:07 2014
@@ -39,9 +39,9 @@ class PrefixedFileSet
private final FileSelector[] selectors;
/**
- * @param fileSet The file set.
+ * @param fileSet The file set.
* @param rootPrefix The root prefix
- * @param selectors The file selectors.
+ * @param selectors The file selectors.
*/
public PrefixedFileSet( final FileSet fileSet, final String rootPrefix,
final FileSelector[] selectors )
{
@@ -58,13 +58,17 @@ class PrefixedFileSet
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String[] getExcludes()
{
return fileSet.getExcludes();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public FileSelector[] getFileSelectors()
{
FileSelector[] sel = fileSet.getFileSelectors();
@@ -72,7 +76,9 @@ class PrefixedFileSet
return combineSelectors( sel, selectors1 );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
static FileSelector[] combineSelectors( FileSelector[] first,
FileSelector[] second )
{
if ( ( first != null ) && ( second != null ) )
@@ -92,13 +98,17 @@ class PrefixedFileSet
return first;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String[] getIncludes()
{
return fileSet.getIncludes();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getPrefix()
{
String prefix = fileSet.getPrefix();
@@ -122,25 +132,33 @@ class PrefixedFileSet
return rootPrefix + prefix;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isCaseSensitive()
{
return fileSet.isCaseSensitive();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isIncludingEmptyDirectories()
{
return fileSet.isIncludingEmptyDirectories();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isUsingDefaultExcludes()
{
return fileSet.isUsingDefaultExcludes();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public File getDirectory()
{
return fileSet.getDirectory();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java
Thu Nov 13 18:08:07 2014
@@ -30,7 +30,7 @@ import org.codehaus.plexus.archiver.Arch
/**
* Handles one top-level section of the assembly descriptor, to determine
which files to include in the assembly archive
* for that section.
- *
+ *
* @version $Id$
*/
public interface AssemblyArchiverPhase
@@ -39,13 +39,13 @@ public interface AssemblyArchiverPhase
/**
* Handle the associated section of the assembly descriptor.
- *
- * @param assembly The assembly descriptor to use
- * @param archiver The archiver used to create the assembly archive, to
which files/directories/artifacts are added
+ *
+ * @param assembly The assembly descriptor to use
+ * @param archiver The archiver used to create the assembly archive,
to which files/directories/artifacts are added
* @param configSource The configuration for this assembly build, normally
derived from the plugin that launched the
- * assembly process.
- * @throws ArchiveCreationException in case of an archive creation error.
- * @throws AssemblyFormattingException in case of a assembly formatting
exception.
+ * assembly process.
+ * @throws ArchiveCreationException in case of an archive
creation error.
+ * @throws AssemblyFormattingException in case of a assembly
formatting exception.
* @throws InvalidAssemblerConfigurationException in case of an invalid
assembler configuration.
*/
void execute( Assembly assembly, Archiver archiver,
AssemblerConfigurationSource configSource )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
Thu Nov 13 18:08:07 2014
@@ -20,15 +20,25 @@ package org.apache.maven.plugin.assembly
import java.util.Comparator;
-public class AssemblyArchiverPhaseComparator implements
Comparator<AssemblyArchiverPhase>
+public class AssemblyArchiverPhaseComparator
+ implements Comparator<AssemblyArchiverPhase>
{
public int compare( AssemblyArchiverPhase o1, AssemblyArchiverPhase o2 )
{
boolean o1hasOrder = o1 instanceof PhaseOrder;
boolean o2hasOrder = o2 instanceof PhaseOrder;
- if (!o1hasOrder && ! o2hasOrder) return
o1.getClass().getName().compareTo( o2.getClass().getName() );
- if (!o1hasOrder) return -1;
- if (!o2hasOrder) return +1;
- return new Integer(((PhaseOrder)o1).order()).compareTo(
((PhaseOrder)o2).order() );
+ if ( !o1hasOrder && !o2hasOrder )
+ {
+ return o1.getClass().getName().compareTo( o2.getClass().getName()
);
+ }
+ if ( !o1hasOrder )
+ {
+ return -1;
+ }
+ if ( !o2hasOrder )
+ {
+ return +1;
+ }
+ return new Integer( ( (PhaseOrder) o1 ).order() ).compareTo( (
(PhaseOrder) o2 ).order() );
}
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
Thu Nov 13 18:08:07 2014
@@ -74,7 +74,8 @@ public class DependencySetAssemblyPhase
* @param projectBuilder The Maven Project Builder.
* @param logger The Logger.
*/
- public DependencySetAssemblyPhase( final MavenProjectBuilder
projectBuilder, DependencyResolver dependencyResolver, final Logger logger )
+ public DependencySetAssemblyPhase( final MavenProjectBuilder
projectBuilder, DependencyResolver dependencyResolver,
+ final Logger logger )
{
this.projectBuilder = projectBuilder;
this.dependencyResolver = dependencyResolver;
@@ -90,13 +91,14 @@ public class DependencySetAssemblyPhase
DependencyResolutionException
{
- Map<DependencySet, Set<Artifact>>
- resolved = dependencyResolver.resolveDependencySets( assembly,
configSource, assembly.getDependencySets() );
+ Map<DependencySet, Set<Artifact>> resolved =
+ dependencyResolver.resolveDependencySets( assembly, configSource,
assembly.getDependencySets() );
for ( Map.Entry<DependencySet, Set<Artifact>> dependencySetSetEntry :
resolved.entrySet() )
{
final AddDependencySetsTask task =
- new AddDependencySetsTask(
Collections.singletonList(dependencySetSetEntry.getKey()),
dependencySetSetEntry.getValue(), configSource.getProject(),
- projectBuilder, getLogger() );
+ new AddDependencySetsTask( Collections.singletonList(
dependencySetSetEntry.getKey() ),
+ dependencySetSetEntry.getValue(),
configSource.getProject(), projectBuilder,
+ getLogger() );
task.execute( archiver, configSource );
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
Thu Nov 13 18:08:07 2014
@@ -95,10 +95,12 @@ public class FileItemAssemblyPhase
}
final String outputDirectory1;
- if (!StringUtils.isEmpty( assembly.getBaseDirectory()))
+ if ( !StringUtils.isEmpty( assembly.getBaseDirectory() ) )
+ {
+ outputDirectory1 = assembly.getBaseDirectory() +
File.separator + fileItem.getOutputDirectory();
+ }
+ else
{
- outputDirectory1 = assembly.getBaseDirectory() +
File.separator + fileItem.getOutputDirectory();
- } else {
outputDirectory1 = fileItem.getOutputDirectory();
}
@@ -124,32 +126,36 @@ public class FileItemAssemblyPhase
target = outputDirectory + "/" + destName;
}
- final PlexusIoFileResource
- res = new PlexusIoFileResource( source,
ArchiverAttributeUtils.getFileAttributes( source ));
+ final PlexusIoFileResource res =
+ new PlexusIoFileResource( source,
ArchiverAttributeUtils.getFileAttributes( source ) );
PlexusIoResource restoUse = res;
try
{
final InputStreamTransformer fileSetTransformers =
- ReaderFormatter.getFileSetTransformers( configSource,
fileItem.isFiltered(), fileItem.getLineEnding() );
+ ReaderFormatter.getFileSetTransformers( configSource,
fileItem.isFiltered(),
+
fileItem.getLineEnding() );
- if (fileSetTransformers != null){
- restoUse = new Deferred( res ){
+ if ( fileSetTransformers != null )
+ {
+ restoUse = new Deferred( res )
+ {
@Override
protected InputStream getInputStream()
throws IOException
{
- return fileSetTransformers.transform(res,
res.getContents());
+ return fileSetTransformers.transform( res,
res.getContents() );
}
@Override
public String getName()
- { return res.getName();
+ {
+ return res.getName();
}
}.asResource();
}
- int mode = TypeConversionUtils.modeToInt(
fileItem.getFileMode(), getLogger() );
- archiver.addResource( restoUse, target, mode );
+ int mode = TypeConversionUtils.modeToInt(
fileItem.getFileMode(), getLogger() );
+ archiver.addResource( restoUse, target, mode );
}
catch ( final ArchiverException e )
{
@@ -179,7 +185,8 @@ public class FileItemAssemblyPhase
IOUtils.closeQuietly( inputStream );
}
- protected abstract InputStream getInputStream() throws IOException;
+ protected abstract InputStream getInputStream()
+ throws IOException;
@Nonnull
public InputStream getContents()
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java
Thu Nov 13 18:08:07 2014
@@ -19,8 +19,6 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.util.List;
-
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.archive.task.AddFileSetsTask;
@@ -32,10 +30,11 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.logging.AbstractLogEnabled;
import javax.annotation.Nonnull;
+import java.util.List;
/**
* Handles the <fileSets/> top-level section of the assembly descriptor.
- *
+ *
* @version $Id$
*/
@Component( role = AssemblyArchiverPhase.class, hint = "file-sets" )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
Thu Nov 13 18:08:07 2014
@@ -19,18 +19,6 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
@@ -42,6 +30,7 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.functions.MavenProjects;
+import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer;
import org.apache.maven.plugin.assembly.model.Assemblies;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.DependencySet;
@@ -49,7 +38,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.model.ModuleBinaries;
import org.apache.maven.plugin.assembly.model.ModuleSet;
import org.apache.maven.plugin.assembly.model.ModuleSources;
-import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
import org.apache.maven.plugin.assembly.utils.FilterUtils;
import org.apache.maven.plugin.assembly.utils.ProjectUtils;
@@ -64,14 +52,25 @@ import org.codehaus.plexus.interpolation
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
-import static org.apache.maven.plugin.assembly.functions.MavenProjects.log;
+import javax.annotation.Nonnull;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import static org.apache.maven.plugin.assembly.functions.MavenProjects.addTo;
+import static org.apache.maven.plugin.assembly.functions.MavenProjects.log;
import static
org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.artifactProjectInterpolator;
import static
org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.moduleProjectInterpolator;
/**
* Handles the <moduleSets/> top-level section of the assembly
descriptor.
- *
+ *
* @version $Id$
*/
@Component( role = AssemblyArchiverPhase.class, hint = "module-sets" )
@@ -81,6 +80,7 @@ public class ModuleSetAssemblyPhase
{
// TODO: Remove if using something like commons-lang instead.
+
/**
* The line separator.
*/
@@ -105,9 +105,10 @@ public class ModuleSetAssemblyPhase
/**
* @param projectBuilder The project builder.
- * @param logger The logger.
+ * @param logger The logger.
*/
- public ModuleSetAssemblyPhase( final MavenProjectBuilder projectBuilder,
DependencyResolver dependencyResolver, final Logger logger )
+ public ModuleSetAssemblyPhase( final MavenProjectBuilder projectBuilder,
DependencyResolver dependencyResolver,
+ final Logger logger )
{
this.projectBuilder = projectBuilder;
this.dependencyResolver = dependencyResolver;
@@ -193,7 +194,7 @@ public class ModuleSetAssemblyPhase
return;
}
- final Set<MavenProject> moduleProjects = new
LinkedHashSet<MavenProject>( );
+ final Set<MavenProject> moduleProjects = new
LinkedHashSet<MavenProject>();
MavenProjects.select( projects, "pom", log( getLogger() ), addTo(
moduleProjects ) );
@@ -213,16 +214,16 @@ public class ModuleSetAssemblyPhase
}
else
{
- getLogger().debug( "Processing binary attachment: " +
classifier + " for module project: "
- + project.getId() );
+ getLogger().debug(
+ "Processing binary attachment: " + classifier + " for
module project: " + project.getId() );
artifact = MavenProjects.findArtifactByClassifier( project,
classifier );
if ( artifact == null )
{
- throw new InvalidAssemblerConfigurationException( "Cannot
find attachment with classifier: "
- + classifier + " in module project: " + project.getId()
- + ". Please exclude this module from the module-set."
);
+ throw new InvalidAssemblerConfigurationException(
+ "Cannot find attachment with classifier: " +
classifier + " in module project: "
+ + project.getId() + ". Please exclude this module
from the module-set." );
}
}
@@ -235,8 +236,7 @@ public class ModuleSetAssemblyPhase
if ( depSets != null )
{
Map<DependencySet, Set<Artifact>> dependencySetSetMap =
- dependencyResolver.resolveDependencySets( assembly, moduleSet,
configSource,
- depSets);
+ dependencyResolver.resolveDependencySets( assembly, moduleSet,
configSource, depSets );
for ( final DependencySet ds : depSets )
{
@@ -269,8 +269,8 @@ public class ModuleSetAssemblyPhase
for ( Map.Entry<DependencySet, Set<Artifact>>
dependencySetSetEntry : dependencySetSetMap.entrySet() )
{
final AddDependencySetsTask task =
- new AddDependencySetsTask( Collections.singletonList(
dependencySetSetEntry.getKey() ), dependencySetSetEntry.getValue(),
- moduleProject,
projectBuilder,
+ new AddDependencySetsTask( Collections.singletonList(
dependencySetSetEntry.getKey() ),
+
dependencySetSetEntry.getValue(), moduleProject, projectBuilder,
getLogger() );
task.setModuleProject( moduleProject );
@@ -334,9 +334,9 @@ public class ModuleSetAssemblyPhase
{
if ( artifact.getFile() == null )
{
- throw new ArchiveCreationException( "Artifact: " + artifact.getId()
- + " (included by module) does not have an artifact with a
file. "
- + "Please ensure the package phase is run before the assembly
is generated." );
+ throw new ArchiveCreationException(
+ "Artifact: " + artifact.getId() + " (included by module) does
not have an artifact with a file. "
+ + "Please ensure the package phase is run before the
assembly is generated." );
}
final AddArtifactTask task = new AddArtifactTask( artifact,
getLogger() );
@@ -487,8 +487,7 @@ public class ModuleSetAssemblyPhase
if ( sources.isExcludeSubModuleDirectories() )
{
- @SuppressWarnings( "unchecked" )
- final List<String> modules = moduleProject.getModules();
+ @SuppressWarnings( "unchecked" ) final List<String> modules =
moduleProject.getModules();
for ( final String moduleSubPath : modules )
{
excludes.add( moduleSubPath + "/**" );
@@ -506,11 +505,12 @@ public class ModuleSetAssemblyPhase
String destPathPrefix = "";
if ( sources.isIncludeModuleDirectory() )
{
- destPathPrefix =
- AssemblyFormatUtils.evaluateFileNameMapping(
sources.getOutputDirectoryMapping(),
-
moduleProject.getArtifact(), configSource.getProject(),
-
moduleProject.getArtifact(), configSource, moduleProjectInterpolator,
-
artifactProjectInterpolator );
+ destPathPrefix = AssemblyFormatUtils.evaluateFileNameMapping(
sources.getOutputDirectoryMapping(),
+
moduleProject.getArtifact(),
+
configSource.getProject(),
+
moduleProject.getArtifact(), configSource,
+
moduleProjectInterpolator,
+
artifactProjectInterpolator );
if ( !destPathPrefix.endsWith( "/" ) )
{
@@ -529,9 +529,8 @@ public class ModuleSetAssemblyPhase
destPath = destPathPrefix + destPath;
}
- destPath =
- AssemblyFormatUtils.getOutputDirectory( destPath,
configSource.getFinalName(), configSource,
- moduleProjectInterpolator,
artifactProjectInterpolator );
+ destPath = AssemblyFormatUtils.getOutputDirectory( destPath,
configSource.getFinalName(), configSource,
+
moduleProjectInterpolator, artifactProjectInterpolator );
fs.setOutputDirectory( destPath );
@@ -564,18 +563,18 @@ public class ModuleSetAssemblyPhase
{
try
{
- moduleProjects =
- ProjectUtils.getProjectModules( project,
configSource.getReactorProjects(),
-
moduleSet.isIncludeSubModules(), logger );
+ moduleProjects = ProjectUtils.getProjectModules( project,
configSource.getReactorProjects(),
+
moduleSet.isIncludeSubModules(), logger );
}
catch ( final IOException e )
{
- throw new ArchiveCreationException( "Error retrieving
module-set for project: " + project.getId()
- + ": " + e.getMessage(), e );
+ throw new ArchiveCreationException(
+ "Error retrieving module-set for project: " +
project.getId() + ": " + e.getMessage(), e );
}
}
- return FilterUtils.filterProjects( moduleProjects,
moduleSet.getIncludes(), moduleSet.getExcludes(), true, logger );
+ return FilterUtils.filterProjects( moduleProjects,
moduleSet.getIncludes(), moduleSet.getExcludes(), true,
+ logger );
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java
Thu Nov 13 18:08:07 2014
@@ -18,6 +18,7 @@ package org.apache.maven.plugin.assembly
* specific language governing permissions and limitations
* under the License.
*/
+
/**
* Indicates the order of a phase
* Elements without order will come before the ordered elements
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
Thu Nov 13 18:08:07 2014
@@ -19,9 +19,6 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.util.List;
-
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
@@ -42,6 +39,9 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import java.io.File;
+import java.util.List;
+
/**
* @version $Id$
*/
@@ -80,10 +80,9 @@ public class RepositoryAssemblyPhase
for ( final Repository repository : repositoriesList )
{
final String outputDirectory =
- AssemblyFormatUtils.getOutputDirectory(
repository.getOutputDirectory(), configSource.getFinalName(), configSource,
-
AssemblyFormatUtils.moduleProjectInterpolator(
-
configSource.getProject() ),
-
AssemblyFormatUtils.artifactProjectInterpolator( null ) );
+ AssemblyFormatUtils.getOutputDirectory(
repository.getOutputDirectory(), configSource.getFinalName(),
+ configSource,
AssemblyFormatUtils.moduleProjectInterpolator(
+ configSource.getProject() ),
AssemblyFormatUtils.artifactProjectInterpolator( null ) );
final File repositoryDirectory = new File( tempRoot,
outputDirectory );
@@ -95,7 +94,8 @@ public class RepositoryAssemblyPhase
try
{
getLogger().debug( "Assembling repository to: " +
repositoryDirectory );
- repositoryAssembler.buildRemoteRepository(
repositoryDirectory, wrap( repository ), wrap( configSource ) );
+ repositoryAssembler.buildRemoteRepository(
repositoryDirectory, wrap( repository ),
+ wrap( configSource
) );
getLogger().debug( "Finished assembling repository to: " +
repositoryDirectory );
}
catch ( final RepositoryAssemblyException e )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
Thu Nov 13 18:08:07 2014
@@ -40,19 +40,25 @@ class GroupVersionAlignmentWrapper
this.alignment = alignment;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public List<String> getExcludes()
{
return alignment.getExcludes();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getId()
{
return alignment.getId();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getVersion()
{
return alignment.getVersion();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java
Thu Nov 13 18:08:07 2014
@@ -45,13 +45,17 @@ public class RepoInfoWrapper
this.repo = repo;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public List<String> getExcludes()
{
return repo.getExcludes();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public List<GroupVersionAlignmentWrapper> getGroupVersionAlignments()
{
final List<GroupVersionAlignment> alignments =
repo.getGroupVersionAlignments();
@@ -72,19 +76,25 @@ public class RepoInfoWrapper
return convertedAlignments;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public List<String> getIncludes()
{
return repo.getIncludes();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getScope()
{
return repo.getScope();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isIncludeMetadata()
{
return repo.isIncludeMetadata();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
Thu Nov 13 18:08:07 2014
@@ -73,9 +73,10 @@ public class AddArtifactTask
private String outputFileNameMapping;
private final Logger logger;
+
private final InputStreamTransformer transformer;
- public AddArtifactTask( final Artifact artifact, final Logger logger,
InputStreamTransformer transformer )
+ public AddArtifactTask( final Artifact artifact, final Logger logger,
InputStreamTransformer transformer )
{
this.artifact = artifact;
this.logger = logger;
@@ -84,15 +85,15 @@ public class AddArtifactTask
public AddArtifactTask( final Artifact artifact, final Logger logger )
{
- this(artifact, logger, null);
+ this( artifact, logger, null );
}
public void execute( final Archiver archiver, final
AssemblerConfigurationSource configSource )
throws ArchiveCreationException, AssemblyFormattingException
{
- if (artifactIsArchiverDestination(archiver))
+ if ( artifactIsArchiverDestination( archiver ) )
{
- artifact.setFile(moveArtifactSomewhereElse(configSource));
+ artifact.setFile( moveArtifactSomewhereElse( configSource ) );
}
String destDirectory =
@@ -100,7 +101,6 @@ public class AddArtifactTask
moduleProjectInterpolator(
moduleProject ),
artifactProjectInterpolator( project ) );
-
boolean fileModeSet = false;
boolean dirModeSet = false;
@@ -160,7 +160,9 @@ public class AddArtifactTask
{
final File artifactFile = artifact.getFile();
- logger.debug( "Adding artifact: " + artifact.getId() + " with
file: " + artifactFile + " to assembly location: " + outputLocation + "." );
+ logger.debug(
+ "Adding artifact: " + artifact.getId() + " with file: " +
artifactFile + " to assembly location: "
+ + outputLocation + "." );
if ( fileMode != -1 )
{
@@ -173,7 +175,8 @@ public class AddArtifactTask
}
catch ( final ArchiverException e )
{
- throw new ArchiveCreationException( "Error adding file '" +
artifact.getId() + "' to archive: " + e.getMessage(), e );
+ throw new ArchiveCreationException(
+ "Error adding file '" + artifact.getId() + "' to archive: " +
e.getMessage(), e );
}
}
@@ -194,12 +197,14 @@ public class AddArtifactTask
}
final String[] excludesArray = TypeConversionUtils.toStringArray(
excludes );
- try {
+ try
+ {
final File artifactFile = artifact.getFile();
if ( artifactFile == null )
{
- logger.warn( "Skipping artifact: " + artifact.getId() + "; it
does not have an associated file or directory." );
+ logger.warn(
+ "Skipping artifact: " + artifact.getId() + "; it does not
have an associated file or directory." );
}
else if ( artifactFile.isDirectory() )
{
@@ -216,8 +221,9 @@ public class AddArtifactTask
{
logger.debug( "Unpacking artifact contents for: " + artifact +
" to: " + outputLocation );
logger.debug( "includes:\n" + StringUtils.join( includesArray,
"\n" ) + "\n" );
- logger.debug( "excludes:\n" + ( excludesArray == null ? "none"
: StringUtils.join( excludesArray, "\n" ) )
- + "\n" );
+ logger.debug(
+ "excludes:\n" + ( excludesArray == null ? "none" :
StringUtils.join( excludesArray, "\n" ) )
+ + "\n" );
DefaultArchivedFileSet afs =
DefaultArchivedFileSet.archivedFileSet( artifactFile );
afs.setIncludes( includesArray );
afs.setExcludes( excludesArray );
@@ -233,30 +239,31 @@ public class AddArtifactTask
}
}
- private File moveArtifactSomewhereElse(AssemblerConfigurationSource
configSource) throws ArchiveCreationException {
+ private File moveArtifactSomewhereElse( AssemblerConfigurationSource
configSource )
+ throws ArchiveCreationException
+ {
final File tempRoot = configSource.getTemporaryRootDirectory();
- final File tempArtifactFile = new File( tempRoot, artifact.getFile()
- .getName() );
+ final File tempArtifactFile = new File( tempRoot,
artifact.getFile().getName() );
- logger.warn( "Artifact: "
- + artifact.getId()
- + " references the same file as the assembly
destination file. Moving it to a temporary location for inclusion." );
+ logger.warn( "Artifact: " + artifact.getId()
+ + " references the same file as the assembly
destination file. Moving it to a temporary location for inclusion." );
try
{
- FileUtils.copyFile(artifact.getFile(), tempArtifactFile);
+ FileUtils.copyFile( artifact.getFile(), tempArtifactFile );
}
catch ( final IOException e )
{
- throw new ArchiveCreationException( "Error moving artifact file:
'" + artifact.getFile()
- + "' to temporary location: " + tempArtifactFile +
". Reason: " + e.getMessage(), e );
+ throw new ArchiveCreationException(
+ "Error moving artifact file: '" + artifact.getFile() + "' to
temporary location: " + tempArtifactFile
+ + ". Reason: " + e.getMessage(), e );
}
return tempArtifactFile;
}
- private boolean artifactIsArchiverDestination(Archiver archiver) {
- return ( ( artifact.getFile() != null ) && ( archiver.getDestFile() !=
null ) )
- && artifact.getFile()
- .equals( archiver.getDestFile() );
+ private boolean artifactIsArchiverDestination( Archiver archiver )
+ {
+ return ( ( artifact.getFile() != null ) && ( archiver.getDestFile() !=
null ) ) && artifact.getFile().equals(
+ archiver.getDestFile() );
}
public void setDirectoryMode( final int directoryMode )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
Thu Nov 13 18:08:07 2014
@@ -89,7 +89,8 @@ public class AddDependencySetsTask
public AddDependencySetsTask( final List<DependencySet> dependencySets,
final Set<Artifact> resolvedArtifacts,
- final MavenProject project, final
MavenProjectBuilder projectBuilder, final Logger logger )
+ final MavenProject project, final
MavenProjectBuilder projectBuilder,
+ final Logger logger )
{
this.dependencySets = dependencySets;
this.resolvedArtifacts = resolvedArtifacts;
@@ -107,8 +108,7 @@ public class AddDependencySetsTask
return;
}
- @SuppressWarnings( "unchecked" )
- final List<Dependency> deps = project.getDependencies();
+ @SuppressWarnings( "unchecked" ) final List<Dependency> deps =
project.getDependencies();
if ( ( deps == null ) || deps.isEmpty() )
{
logger.debug( "Project " + project.getId() + " has no
dependencies. Skipping dependency set addition." );
@@ -129,7 +129,7 @@ public class AddDependencySetsTask
if ( !dependencySet.isUseTransitiveDependencies() &&
dependencySet.isUseTransitiveFiltering() )
{
logger.warn( "DependencySet has nonsensical configuration:
useTransitiveDependencies == false "
- + "AND useTransitiveFiltering == true. Transitive filtering
flag will be ignored." );
+ + "AND useTransitiveFiltering == true. Transitive
filtering flag will be ignored." );
}
final Set<Artifact> dependencyArtifacts = resolveDependencyArtifacts(
dependencySet );
@@ -152,20 +152,19 @@ public class AddDependencySetsTask
dependencySet.getUnpackOptions().getLineEnding() )
: null;
-
for ( final Artifact depArtifact : dependencyArtifacts )
{
MavenProject depProject;
try
{
- depProject =
- projectBuilder.buildFromRepository( depArtifact,
configSource.getRemoteRepositories(),
-
configSource.getLocalRepository() );
+ depProject = projectBuilder.buildFromRepository( depArtifact,
configSource.getRemoteRepositories(),
+
configSource.getLocalRepository() );
}
catch ( final ProjectBuildingException e )
{
- logger.debug( "Error retrieving POM of module-dependency: " +
depArtifact.getId() + "; Reason: "
- + e.getMessage() + "\n\nBuilding stub project instance." );
+ logger.debug(
+ "Error retrieving POM of module-dependency: " +
depArtifact.getId() + "; Reason: " + e.getMessage()
+ + "\n\nBuilding stub project instance." );
depProject = buildProjectStub( depArtifact );
}
@@ -176,7 +175,8 @@ public class AddDependencySetsTask
}
else
{
- addNormalArtifact( dependencySet, depArtifact, depProject,
archiver, configSource, fileSetTransformers );
+ addNormalArtifact( dependencySet, depArtifact, depProject,
archiver, configSource,
+ fileSetTransformers );
}
}
}
@@ -197,10 +197,10 @@ public class AddDependencySetsTask
if ( ( dir == null || !dir.contains( "${" ) ) && ( mapping == null ||
!mapping.contains( "${" ) ) )
{
- logger.warn( "NOTE: Your assembly specifies a dependencySet that
matches multiple artifacts, but specifies a concrete output format. "
- + "THIS MAY RESULT IN ONE OR MORE ARTIFACTS BEING
OBSCURED!\n\nOutput directory: '"
- + dir
- + "'\nOutput filename mapping: '" + mapping + "'" );
+ logger.warn(
+ "NOTE: Your assembly specifies a dependencySet that matches
multiple artifacts, but specifies a concrete output format. "
+ + "THIS MAY RESULT IN ONE OR MORE ARTIFACTS BEING
OBSCURED!\n\nOutput directory: '" + dir
+ + "'\nOutput filename mapping: '" + mapping + "'" );
}
}
@@ -280,14 +280,13 @@ public class AddDependencySetsTask
else
{
logger.warn( "Cannot include project artifact: " +
projectArtifact
- + "; it doesn't have an associated file or directory." );
+ + "; it doesn't have an associated file or
directory." );
}
}
if ( dependencySet.isUseProjectAttachments() )
{
- @SuppressWarnings( "unchecked" )
- final List<Artifact> attachments = project.getAttachedArtifacts();
+ @SuppressWarnings( "unchecked" ) final List<Artifact> attachments
= project.getAttachedArtifacts();
if ( attachments != null )
{
for ( final Artifact attachment : attachments )
@@ -298,8 +297,9 @@ public class AddDependencySetsTask
}
else
{
- logger.warn( "Cannot include attached artifact: " +
project.getId() + " for project: "
- + project.getId() + "; it doesn't have an
associated file or directory." );
+ logger.warn(
+ "Cannot include attached artifact: " +
project.getId() + " for project: " + project.getId()
+ + "; it doesn't have an associated file or
directory." );
}
}
}
@@ -324,8 +324,8 @@ public class AddDependencySetsTask
}
private void addNonArchiveDependency( final Artifact depArtifact, final
MavenProject depProject,
- final DependencySet dependencySet, final
Archiver archiver,
- final AssemblerConfigurationSource
configSource )
+ final DependencySet dependencySet,
final Archiver archiver,
+ final AssemblerConfigurationSource
configSource )
throws AssemblyFormattingException, ArchiveCreationException
{
final File source = depArtifact.getFile();
@@ -340,9 +340,8 @@ public class AddDependencySetsTask
final String destName =
AssemblyFormatUtils.evaluateFileNameMapping(
dependencySet.getOutputFileNameMapping(), depArtifact,
-
configSource.getProject(), moduleArtifact, configSource,
moduleProjectInterpolator,
-
artifactProjectInterpolator );
-
+
configSource.getProject(), moduleArtifact, configSource,
+
moduleProjectInterpolator, artifactProjectInterpolator );
String target;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
Thu Nov 13 18:08:07 2014
@@ -58,9 +58,10 @@ public class AddDirectoryTask
this.transformer = transformers;
}
+
public AddDirectoryTask( final File directory )
{
- this( directory, null);
+ this( directory, null );
}
public void execute( final Archiver archiver )
@@ -72,8 +73,9 @@ public class AddDirectoryTask
}
else if ( "..".equals( outputDirectory ) )
{
- throw new ArchiveCreationException( "Cannot add source directory:
" + directory + " to archive-path: "
- + outputDirectory + ". All paths must be within the archive
root directory." );
+ throw new ArchiveCreationException(
+ "Cannot add source directory: " + directory + " to
archive-path: " + outputDirectory
+ + ". All paths must be within the archive root directory."
);
}
final int oldDirMode = archiver.getOverrideDirectoryMode();
@@ -137,8 +139,9 @@ public class AddDirectoryTask
fs.setDirectory( directory );
fs.setIncludes( includesArray );
fs.setExcludes( excludesArray );
- if (transformer != null){
- fs.setStreamTransformer( transformer );
+ if ( transformer != null )
+ {
+ fs.setStreamTransformer( transformer );
}
archiver.addFileSet( fs );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=1639422&r1=1639421&r2=1639422&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
Thu Nov 13 18:08:07 2014
@@ -19,11 +19,6 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
@@ -37,6 +32,11 @@ import org.codehaus.plexus.components.io
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
/**
* @version $Id$
*/
@@ -75,13 +75,13 @@ public class AddFileSetsTask
{
if ( !archiveBaseDir.exists() )
{
- throw new ArchiveCreationException( "The archive base
directory '" + archiveBaseDir.getAbsolutePath()
- + "' does not exist" );
+ throw new ArchiveCreationException(
+ "The archive base directory '" +
archiveBaseDir.getAbsolutePath() + "' does not exist" );
}
else if ( !archiveBaseDir.isDirectory() )
{
throw new ArchiveCreationException( "The archive base
directory '" + archiveBaseDir.getAbsolutePath()
- + "' exists, but it is not a directory" );
+ + "' exists, but it is
not a directory" );
}
}
@@ -129,10 +129,11 @@ public class AddFileSetsTask
*/
if ( logger.isDebugEnabled() )
{
- logger.debug( "FileSet[" + destDirectory + "]" + " dir perms: "
- + Integer.toString( archiver.getOverrideDirectoryMode(), 8 ) +
" file perms: "
- + Integer.toString( archiver.getOverrideFileMode(), 8 )
- + ( fileSet.getLineEnding() == null ? "" : " lineEndings: " +
fileSet.getLineEnding() ) );
+ logger.debug( "FileSet[" + destDirectory + "]" + " dir perms: " +
Integer.toString(
+ archiver.getOverrideDirectoryMode(), 8 ) + " file perms: " +
Integer.toString(
+ archiver.getOverrideFileMode(), 8 ) + (
fileSet.getLineEnding() == null
+ ? ""
+ : " lineEndings: " + fileSet.getLineEnding() ) );
}
logger.debug( "The archive base directory is '" + archiveBaseDir + "'"
);
@@ -141,18 +142,18 @@ public class AddFileSetsTask
if ( fileSetDir.exists() )
{
- InputStreamTransformer fileSetTransformers =
ReaderFormatter.getFileSetTransformers( configSource, fileSet.isFiltered(),
-
fileSet.getLineEnding() );
- if (fileSetTransformers == null)
+ InputStreamTransformer fileSetTransformers =
+ ReaderFormatter.getFileSetTransformers( configSource,
fileSet.isFiltered(), fileSet.getLineEnding() );
+ if ( fileSetTransformers == null )
{
logger.debug( "NOT reformatting any files in " + fileSetDir );
}
if ( fileSetDir.getPath().equals( File.separator ) )
{
- throw new AssemblyFormattingException( "Your assembly
descriptor specifies a directory of "
- + File.separator
- + ", which is your *entire* file system.\nThese are not
the files you are looking for" );
+ throw new AssemblyFormattingException(
+ "Your assembly descriptor specifies a directory of " +
File.separator
+ + ", which is your *entire* file system.\nThese are
not the files you are looking for" );
}
final AddDirectoryTask task = new AddDirectoryTask( fileSetDir,
fileSetTransformers );
