Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.filter; +package org.apache.maven.plugins.assembly.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils; +import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.UnArchiver; @@ -54,20 +54,20 @@ public class SimpleAggregatingDescriptor // component configuration. - private String filePattern; - - private String outputPath; - @SuppressWarnings( "FieldCanBeLocal" ) private final String commentChars = "#"; + private final StringWriter aggregateWriter = new StringWriter(); + + private final List<String> filenames = new ArrayList<String>(); + // calculated, temporary values. - private boolean overrideFilterAction; + private String filePattern; - private final StringWriter aggregateWriter = new StringWriter(); + private String outputPath; - private final List<String> filenames = new ArrayList<String>(); + private boolean overrideFilterAction; // injected by the container. @@ -80,8 +80,8 @@ public class SimpleAggregatingDescriptor if ( outputPath.endsWith( "/" ) ) { throw new ArchiverException( "Cannot write aggregated properties to a directory. " - + "You must specify a file name in the outputPath configuration for this handler. (handler: " - + getClass().getName() ); + + "You must specify a file name in the outputPath configuration for this" + + " handler. (handler: " + getClass().getName() ); } if ( outputPath.startsWith( "/" ) ) @@ -149,7 +149,7 @@ public class SimpleAggregatingDescriptor return Collections.singletonList( outputPath ); } - public boolean isSelected( @Nonnull final FileInfo fileInfo ) + public boolean isSelected( @Nonnull final FileInfo fileInfo ) throws IOException { checkConfig();
Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.format; +package org.apache.maven.plugins.assembly.format; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.format; +package org.apache.maven.plugins.assembly.format; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,10 +20,10 @@ package org.apache.maven.plugin.assembly */ import org.apache.commons.io.input.ReaderInputStream; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils; -import org.apache.maven.plugin.assembly.utils.LineEndings; -import org.apache.maven.plugin.assembly.utils.LineEndingsUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils; +import org.apache.maven.plugins.assembly.utils.LineEndings; +import org.apache.maven.plugins.assembly.utils.LineEndingsUtils; import org.apache.maven.shared.filtering.MavenFilteringException; import org.apache.maven.shared.filtering.MavenReaderFilterRequest; import org.codehaus.plexus.components.io.functions.InputStreamTransformer; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReflectionProperties.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReflectionProperties.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReflectionProperties.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReflectionProperties.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.format; +package org.apache.maven.plugins.assembly.format; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -37,10 +37,10 @@ public class ReflectionProperties private static final long serialVersionUID = 1L; - private final MavenProject project; - final boolean escapedBackslashesInFilePath; + private final MavenProject project; + public ReflectionProperties( final MavenProject aProject, final boolean escapedBackslashesInFilePath ) { super(); Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjectConsumer.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjectConsumer.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjectConsumer.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjectConsumer.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.functions; +package org.apache.maven.plugins.assembly.functions; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package org.apache.maven.plugin.assembly import org.apache.maven.project.MavenProject; /** - * + * */ public interface MavenProjectConsumer { Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.functions; +package org.apache.maven.plugins.assembly.functions; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,7 +29,7 @@ import java.util.List; import java.util.Set; /** - * + * */ public class MavenProjects { Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/ModuleSetConsumer.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/ModuleSetConsumer.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/ModuleSetConsumer.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/ModuleSetConsumer.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.functions; +package org.apache.maven.plugins.assembly.functions; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,14 +19,14 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.ModuleSet; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.ModuleSet; /** - * + * */ public interface ModuleSetConsumer { Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.interpolation; +package org.apache.maven.plugins.assembly.interpolation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.io.DefaultAssemblyReader; -import org.apache.maven.plugin.assembly.utils.InterpolationConstants; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.io.DefaultAssemblyReader; +import org.apache.maven.plugins.assembly.utils.InterpolationConstants; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; @@ -32,7 +32,7 @@ import org.codehaus.plexus.interpolation import java.io.File; /** - * + * */ public class AssemblyExpressionEvaluator implements ExpressionEvaluator Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolationException.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolationException.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolationException.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolationException.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.interpolation; +package org.apache.maven.plugins.assembly.interpolation; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.interpolation; +package org.apache.maven.plugins.assembly.interpolation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Reader; -import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Reader; -import org.apache.maven.plugin.assembly.resolved.AssemblyId; -import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Reader; +import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Reader; +import org.apache.maven.plugins.assembly.resolved.AssemblyId; +import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.interpolation.InterpolationPostProcessor; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReadException.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReadException.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReadException.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReadException.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReadException.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReadException.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReadException.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.io; +package org.apache.maven.plugins.assembly.io; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReader.java (from r1685251, 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/plugins/assembly/io/AssemblyReader.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReader.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/AssemblyReader.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/io/AssemblyReader.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.io; +package org.apache.maven.plugins.assembly.io; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,9 +20,9 @@ package org.apache.maven.plugin.assembly */ 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.model.Assembly; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.model.Assembly; import java.io.File; import java.util.List; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java (from r1685251, 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/plugins/assembly/io/DefaultAssemblyReader.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/io/DefaultAssemblyReader.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.io; +package org.apache.maven.plugins.assembly.io; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,22 +20,23 @@ package org.apache.maven.plugin.assembly */ import org.apache.commons.io.IOUtils; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.interpolation.AssemblyExpressionEvaluator; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.Component; -import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig; -import org.apache.maven.plugin.assembly.model.DependencySet; -import org.apache.maven.plugin.assembly.model.FileItem; -import org.apache.maven.plugin.assembly.model.FileSet; -import org.apache.maven.plugin.assembly.model.ModuleSet; -import org.apache.maven.plugin.assembly.model.Repository; -import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Reader; -import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Writer; -import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Reader; -import org.apache.maven.plugin.assembly.resolved.AssemblyId; -import org.apache.maven.plugin.assembly.utils.InterpolationConstants; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.interpolation.AssemblyExpressionEvaluator; +import org.apache.maven.plugins.assembly.interpolation.AssemblyInterpolator; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.Component; +import org.apache.maven.plugins.assembly.model.ContainerDescriptorHandlerConfig; +import org.apache.maven.plugins.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.model.FileItem; +import org.apache.maven.plugins.assembly.model.FileSet; +import org.apache.maven.plugins.assembly.model.ModuleSet; +import org.apache.maven.plugins.assembly.model.Repository; +import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Reader; +import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Writer; +import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Reader; +import org.apache.maven.plugins.assembly.resolved.AssemblyId; +import org.apache.maven.plugins.assembly.utils.InterpolationConstants; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.io.location.ClasspathResourceLocatorStrategy; import org.apache.maven.shared.io.location.FileLocatorStrategy; @@ -68,11 +69,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator.componentInterpolator; -import static org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator.assemblyInterpolator; -import static org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator.fullInterpolator; -import static org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator.checkErrors; - /** * @version $Id$ @@ -83,6 +79,14 @@ public class DefaultAssemblyReader implements AssemblyReader { + public static FixedStringSearchInterpolator createProjectInterpolator( MavenProject project ) + { + return FixedStringSearchInterpolator.create( + new PrefixedPropertiesValueSource( InterpolationConstants.PROJECT_PROPERTIES_PREFIXES, + project.getProperties(), true ), + new PrefixedObjectValueSource( InterpolationConstants.PROJECT_PREFIXES, project, true ) ); + } + public List<Assembly> readAssemblies( final AssemblerConfigurationSource configSource ) throws AssemblyReadException, InvalidAssemblerConfigurationException { @@ -324,7 +328,7 @@ public class DefaultAssemblyReader } public Assembly readAssembly( final Reader reader, final String locationDescription, final File assemblyDir, - final AssemblerConfigurationSource configSource ) + final AssemblerConfigurationSource configSource ) throws AssemblyReadException, InvalidAssemblerConfigurationException { Assembly assembly; @@ -339,17 +343,19 @@ public class DefaultAssemblyReader is.setRecursionInterceptor( interceptor ); FixedStringSearchInterpolator interpolator = - fullInterpolator( project, createProjectInterpolator( project ), configSource ); - AssemblyXpp3Reader.ContentTransformer transformer = assemblyInterpolator( interpolator, is, getLogger() ); + AssemblyInterpolator.fullInterpolator( project, createProjectInterpolator( project ), configSource ); + AssemblyXpp3Reader.ContentTransformer transformer = + AssemblyInterpolator.assemblyInterpolator( interpolator, is, getLogger() ); final AssemblyXpp3Reader r = new AssemblyXpp3Reader( transformer ); assembly = r.read( reader ); - ComponentXpp3Reader.ContentTransformer ctrans = componentInterpolator( interpolator, is, getLogger() ); + ComponentXpp3Reader.ContentTransformer ctrans = + AssemblyInterpolator.componentInterpolator( interpolator, is, getLogger() ); mergeComponentsWithMainAssembly( assembly, assemblyDir, configSource, ctrans ); debugPrintAssembly( "After assembly is interpolated:", assembly ); - checkErrors( AssemblyId.createAssemblyId( assembly ), is, getLogger() ); + AssemblyInterpolator.checkErrors( AssemblyId.createAssemblyId( assembly ), is, getLogger() ); } catch ( final IOException e ) @@ -375,15 +381,6 @@ public class DefaultAssemblyReader return assembly; } - - public static FixedStringSearchInterpolator createProjectInterpolator( MavenProject project ) - { - return FixedStringSearchInterpolator.create( - new PrefixedPropertiesValueSource( InterpolationConstants.PROJECT_PROPERTIES_PREFIXES, - project.getProperties(), true ), - new PrefixedObjectValueSource( InterpolationConstants.PROJECT_PREFIXES, project, true ) ); - } - private void debugPrintAssembly( final String message, final Assembly assembly ) { final StringWriter sWriter = new StringWriter(); Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.io; +package org.apache.maven.plugins.assembly.io; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.io; +package org.apache.maven.plugins.assembly.io; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/model/Assemblies.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/model/Assemblies.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/model/Assemblies.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/model/Assemblies.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.model; +package org.apache.maven.plugins.assembly.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,14 +19,14 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.functions.ModuleSetConsumer; /** - * + * */ public class Assemblies { Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java (from r1685251, 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/plugins/assembly/mojos/AbstractAssemblyMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/mojos/AbstractAssemblyMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,19 +25,19 @@ import org.apache.maven.execution.MavenS import org.apache.maven.plugin.AbstractMojo; 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.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.AssemblyArchiver; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.io.AssemblyReadException; -import org.apache.maven.plugin.assembly.io.AssemblyReader; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; -import org.apache.maven.plugin.assembly.utils.InterpolationConstants; import org.apache.maven.plugin.logging.Log; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.AssemblyArchiver; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.io.AssemblyReadException; +import org.apache.maven.plugins.assembly.io.AssemblyReader; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils; +import org.apache.maven.plugins.assembly.utils.InterpolationConstants; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; import org.apache.maven.shared.filtering.MavenReaderFilter; @@ -63,6 +63,20 @@ public abstract class AbstractAssemblyMo extends AbstractMojo implements AssemblerConfigurationSource { + protected FixedStringSearchInterpolator commanndLinePropertiesInterpolator; + + protected FixedStringSearchInterpolator envInterpolator; + + protected FixedStringSearchInterpolator mainProjectInterpolator; + + protected FixedStringSearchInterpolator rootInterpolator; + + /** + * Set to false to exclude the assembly id from the assembly final name. + */ + @Parameter( property = "assembly.appendAssemblyId", defaultValue = "true" ) + boolean appendAssemblyId; + /** * The character encoding scheme to be applied when filtering resources. */ @@ -260,12 +274,6 @@ public abstract class AbstractAssemblyMo private boolean includeSite; /** - * Set to false to exclude the assembly id from the assembly final name. - */ - @Parameter( property = "assembly.appendAssemblyId", defaultValue = "true" ) - boolean appendAssemblyId; - - /** * Set to true in order to not fail when a descriptor is missing. */ @Parameter( property = "assembly.ignoreMissingDescriptor", defaultValue = "false" ) @@ -413,13 +421,24 @@ public abstract class AbstractAssemblyMo @Parameter private List<String> delimiters; - protected FixedStringSearchInterpolator commanndLinePropertiesInterpolator; - - protected FixedStringSearchInterpolator envInterpolator; - - protected FixedStringSearchInterpolator mainProjectInterpolator; + public static FixedStringSearchInterpolator mainProjectInterpolator( MavenProject mainProject ) + { + if ( mainProject != null ) + { + // 5 + return FixedStringSearchInterpolator.create( + new org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource( + InterpolationConstants.PROJECT_PREFIXES, mainProject, true ), - protected FixedStringSearchInterpolator rootInterpolator; + // 6 + new org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource( + InterpolationConstants.PROJECT_PROPERTIES_PREFIXES, mainProject.getProperties(), true ) ); + } + else + { + return FixedStringSearchInterpolator.empty(); + } + } /** * Create the binary distribution. @@ -505,11 +524,12 @@ public abstract class AbstractAssemblyMo final StringBuilder message = new StringBuilder(); message.append( "Configuration options: 'appendAssemblyId' is set to false, " - + "and 'classifier' is missing." ); + + "and 'classifier' is missing." ); message.append( "\nInstead of attaching the assembly file: " ).append( destFile ); message.append( ", it will become the file for main project artifact." ); message.append( "\nNOTE: If multiple descriptors or descriptor-formats are provided " - + "for this project, the value of this file will be non-deterministic!" ); + + "for this project, the value of this file will be " + + "non-deterministic!" ); getLog().warn( message ); warnedAboutMainProjectArtifact = true; @@ -532,7 +552,8 @@ public abstract class AbstractAssemblyMo else if ( attach ) { getLog().warn( "Assembly file: " + destFile + " is not a regular file (it may be a directory). " - + "It cannot be attached to the project build for installation or deployment." ); + + "It cannot be attached to the project build for installation or " + + "deployment." ); } } } @@ -636,6 +657,11 @@ public abstract class AbstractAssemblyMo return basedir; } + public void setBasedir( final File basedir ) + { + this.basedir = basedir; + } + /** * {@inheritDoc} * @@ -650,6 +676,17 @@ public abstract class AbstractAssemblyMo /** * {@inheritDoc} * + * @deprecated This has been replaced by {@link #setDescriptors(String[])} + */ + @Deprecated + public void setDescriptor( final String descriptor ) + { + this.descriptor = descriptor; + } + + /** + * {@inheritDoc} + * * @deprecated This has been replaced by {@link #getDescriptorReferences()} */ @Deprecated @@ -658,6 +695,17 @@ public abstract class AbstractAssemblyMo return descriptorId; } + /** + * {@inheritDoc} + * + * @deprecated This has been replaced by {@link #setDescriptorRefs(String[])} + */ + @Deprecated + public void setDescriptorId( final String descriptorId ) + { + this.descriptorId = descriptorId; + } + public String[] getDescriptorReferences() { return descriptorRefs; @@ -668,11 +716,21 @@ public abstract class AbstractAssemblyMo return descriptorSourceDirectory; } + public void setDescriptorSourceDirectory( final File descriptorSourceDirectory ) + { + this.descriptorSourceDirectory = descriptorSourceDirectory; + } + public String[] getDescriptors() { return descriptors; } + public void setDescriptors( final String[] descriptors ) + { + this.descriptors = descriptors; + } + public abstract MavenProject getProject(); public File getSiteDirectory() @@ -680,6 +738,11 @@ public abstract class AbstractAssemblyMo return siteDirectory; } + public void setSiteDirectory( final File siteDirectory ) + { + this.siteDirectory = siteDirectory; + } + public boolean isSiteIncluded() { return includeSite; @@ -690,6 +753,11 @@ public abstract class AbstractAssemblyMo return finalName; } + public void setFinalName( final String finalName ) + { + this.finalName = finalName; + } + public boolean isAssemblyIdAppended() { return appendAssemblyId; @@ -700,11 +768,21 @@ public abstract class AbstractAssemblyMo return tarLongFileMode; } + public void setTarLongFileMode( final String tarLongFileMode ) + { + this.tarLongFileMode = tarLongFileMode; + } + public File getOutputDirectory() { return outputDirectory; } + public void setOutputDirectory( final File outputDirectory ) + { + this.outputDirectory = outputDirectory; + } + public MavenArchiveConfiguration getJarArchiveConfiguration() { return archive; @@ -720,6 +798,11 @@ public abstract class AbstractAssemblyMo return localRepository; } + public void setLocalRepository( final ArtifactRepository localRepository ) + { + this.localRepository = localRepository; + } + public File getTemporaryRootDirectory() { return tempRoot; @@ -743,6 +826,11 @@ public abstract class AbstractAssemblyMo return filters; } + public void setFilters( final List<String> filters ) + { + this.filters = filters; + } + public boolean isIncludeProjectBuildFilters() { return includeProjectBuildFilters; @@ -753,31 +841,15 @@ public abstract class AbstractAssemblyMo return reactorProjects; } - public String getClassifier() - { - // TODO Auto-generated method stub - return null; - } - - protected MavenProjectHelper getProjectHelper() - { - return projectHelper; - } - - public void setAppendAssemblyId( final boolean appendAssemblyId ) - { - this.appendAssemblyId = appendAssemblyId; - } - - public void setArchive( final MavenArchiveConfiguration archive ) + public void setReactorProjects( final List<MavenProject> reactorProjects ) { - this.archive = archive; + this.reactorProjects = reactorProjects; } - - public void setBasedir( final File basedir ) + public String getClassifier() { - this.basedir = basedir; + // TODO Auto-generated method stub + return null; } public void setClassifier( final String classifier ) @@ -785,51 +857,29 @@ public abstract class AbstractAssemblyMo this.classifier = classifier; } - /** - * {@inheritDoc} - * - * @deprecated This has been replaced by {@link #setDescriptors(String[])} - */ - @Deprecated - public void setDescriptor( final String descriptor ) - { - this.descriptor = descriptor; - } - - /** - * {@inheritDoc} - * - * @deprecated This has been replaced by {@link #setDescriptorRefs(String[])} - */ - @Deprecated - public void setDescriptorId( final String descriptorId ) - { - this.descriptorId = descriptorId; - } - - public void setDescriptorRefs( final String[] descriptorRefs ) + protected MavenProjectHelper getProjectHelper() { - this.descriptorRefs = descriptorRefs; + return projectHelper; } - public void setDescriptors( final String[] descriptors ) + public void setProjectHelper( final MavenProjectHelper projectHelper ) { - this.descriptors = descriptors; + this.projectHelper = projectHelper; } - public void setDescriptorSourceDirectory( final File descriptorSourceDirectory ) + public void setAppendAssemblyId( final boolean appendAssemblyId ) { - this.descriptorSourceDirectory = descriptorSourceDirectory; + this.appendAssemblyId = appendAssemblyId; } - public void setFilters( final List<String> filters ) + public void setArchive( final MavenArchiveConfiguration archive ) { - this.filters = filters; + this.archive = archive; } - public void setFinalName( final String finalName ) + public void setDescriptorRefs( final String[] descriptorRefs ) { - this.finalName = finalName; + this.descriptorRefs = descriptorRefs; } public void setIncludeSite( final boolean includeSite ) @@ -837,36 +887,6 @@ public abstract class AbstractAssemblyMo this.includeSite = includeSite; } - public void setLocalRepository( final ArtifactRepository localRepository ) - { - this.localRepository = localRepository; - } - - public void setOutputDirectory( final File outputDirectory ) - { - this.outputDirectory = outputDirectory; - } - - public void setProjectHelper( final MavenProjectHelper projectHelper ) - { - this.projectHelper = projectHelper; - } - - public void setReactorProjects( final List<MavenProject> reactorProjects ) - { - this.reactorProjects = reactorProjects; - } - - public void setSiteDirectory( final File siteDirectory ) - { - this.siteDirectory = siteDirectory; - } - - public void setTarLongFileMode( final String tarLongFileMode ) - { - this.tarLongFileMode = tarLongFileMode; - } - public void setTempRoot( final File tempRoot ) { this.tempRoot = tempRoot; @@ -952,7 +972,13 @@ public abstract class AbstractAssemblyMo return delimiters; } - @Nonnull public FixedStringSearchInterpolator getCommandLinePropsInterpolator() + public void setDelimiters( List<String> delimiters ) + { + this.delimiters = delimiters; + } + + @Nonnull + public FixedStringSearchInterpolator getCommandLinePropsInterpolator() { if ( commanndLinePropertiesInterpolator == null ) { @@ -971,7 +997,8 @@ public abstract class AbstractAssemblyMo return envInterpolator; } - @Nonnull public FixedStringSearchInterpolator getRepositoryInterpolator() + @Nonnull + public FixedStringSearchInterpolator getRepositoryInterpolator() { if ( rootInterpolator == null ) { @@ -980,7 +1007,6 @@ public abstract class AbstractAssemblyMo return rootInterpolator; } - @Nonnull public FixedStringSearchInterpolator getMainProjectInterpolator() { @@ -991,29 +1017,4 @@ public abstract class AbstractAssemblyMo return mainProjectInterpolator; } - public static FixedStringSearchInterpolator mainProjectInterpolator( MavenProject mainProject ) - { - if ( mainProject != null ) - { - // 5 - return FixedStringSearchInterpolator.create( - new org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource( - InterpolationConstants.PROJECT_PREFIXES, mainProject, true ), - - // 6 - new org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource( - InterpolationConstants.PROJECT_PROPERTIES_PREFIXES, mainProject.getProperties(), true ) ); - } - else - { - return FixedStringSearchInterpolator.empty(); - } - } - - - public void setDelimiters( List<String> delimiters ) - { - this.delimiters = delimiters; - } - } Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractDirectoryMojo.java (from r1685251, 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/plugins/assembly/mojos/AbstractDirectoryMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractDirectoryMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractDirectoryMojo.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/mojos/AbstractDirectoryMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,13 +21,13 @@ package org.apache.maven.plugin.assembly import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.AssemblyArchiver; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.io.AssemblyReadException; -import org.apache.maven.plugin.assembly.io.AssemblyReader; -import org.apache.maven.plugin.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.AssemblyArchiver; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.io.AssemblyReadException; +import org.apache.maven.plugins.assembly.io.AssemblyReader; +import org.apache.maven.plugins.assembly.model.Assembly; import java.util.List; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AssemblyMojo.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AssemblyMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AssemblyMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AssemblyMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AssemblyMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AttachedAssemblyMojo.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AttachedAssemblyMojo.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AttachedAssemblyMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AttachedAssemblyMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AttachedAssemblyMojo.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AttachedAssemblyMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AttachedAssemblyMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryInlineMojo.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryInlineMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryInlineMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryInlineMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryInlineMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryMojo.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectoryMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectoryMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectorySingleMojo.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectorySingleMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectorySingleMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/DirectorySingleMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/DirectorySingleMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/SingleAssemblyMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -34,7 +34,7 @@ import org.apache.maven.project.MavenPro * @version $Id$ */ @Mojo( name = "single", inheritByDefault = false, requiresDependencyResolution = ResolutionScope.COMPILE, - threadSafe = true ) + threadSafe = true ) public class SingleAssemblyMojo extends AbstractAssemblyMojo { Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/UnpackMojo.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/UnpackMojo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/UnpackMojo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/UnpackMojo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.mojos; +package org.apache.maven.plugins.assembly.mojos; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,12 +23,12 @@ import org.apache.maven.artifact.Artifac import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException; -import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; +import org.apache.maven.plugins.assembly.archive.ArchiveExpansionException; +import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.manager.ArchiverManager; import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; @@ -50,6 +50,12 @@ public class UnpackMojo { /** + * Directory to unpack JARs into if needed + */ + @Parameter( defaultValue = "${project.build.directory}/assembly/work", required = true ) + protected File workDirectory; + + /** */ @Parameter( defaultValue = "${project}", readonly = true, required = true ) private MavenProject project; @@ -60,12 +66,6 @@ public class UnpackMojo private ArchiverManager archiverManager; /** - * Directory to unpack JARs into if needed - */ - @Parameter( defaultValue = "${project.build.directory}/assembly/work", required = true ) - protected File workDirectory; - - /** * Unpacks the archive file. * * @throws MojoExecutionException Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/resolved/AssemblyId.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/resolved/AssemblyId.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/resolved/AssemblyId.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/AssemblyId.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/resolved/AssemblyId.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.resolved; +package org.apache.maven.plugins.assembly.resolved; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.Assembly; /** - * + * */ public class AssemblyId { Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java (from r1685251, 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/plugins/assembly/utils/AssemblyFileUtils.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/utils/AssemblyFileUtils.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException; +import org.apache.maven.plugins.assembly.archive.ArchiveExpansionException; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.UnArchiver; import org.codehaus.plexus.archiver.manager.ArchiverManager; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ package org.apache.maven.plugin.assembly import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.utils.Os; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; @@ -124,9 +124,11 @@ public final class AssemblyFormatUtils // CHECKSTYLE_OFF: LineLength return FixedStringSearchInterpolator.create( new PrefixedObjectValueSource( "module.", moduleArtifact ), new PrefixedObjectValueSource( "module.", - moduleArtifact.getArtifactHandler() ), + moduleArtifact + .getArtifactHandler() ), new PrefixedObjectValueSource( "module.handler.", - moduleArtifact.getArtifactHandler() ) ); + moduleArtifact + .getArtifactHandler() ) ); // CHECKSTYLE_ON: LineLength } else Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package org.apache.maven.plugin.assembly import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.resolver.filter.AndArtifactFilter; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter; import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/InterpolationConstants.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/InterpolationConstants.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/InterpolationConstants.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/InterpolationConstants.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.List; /** - * + * */ public final class InterpolationConstants { Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndings.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndings.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndings.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndings.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtils.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; import org.codehaus.plexus.util.IOUtil; import javax.annotation.Nonnull; @@ -187,7 +187,7 @@ public final class LineEndingsUtils * Returns the appopriate line ending characters for the specified style * * @param lineEnding The name of the line ending style, - * see org.apache.maven.plugin.assembly.utils.LineEndings#valueOf + * see org.apache.maven.plugin.assembly.utils.LineEndings#valueOf * @return The proper line ending characters * @throws AssemblyFormattingException */ Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStream.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStream.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStream.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStream.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStream.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,16 +29,16 @@ class LinuxLineFeedInputStream extends InputStream { + private final InputStream target; + + private final boolean ensureLineFeedAtEndOfFile; + private boolean slashNSeen = false; private boolean slashRSeen = false; private boolean eofSeen = false; - private final InputStream target; - - private final boolean ensureLineFeedAtEndOfFile; - public LinuxLineFeedInputStream( InputStream in, boolean ensureLineFeedAtEndOfFile ) { this.target = in; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; import org.codehaus.plexus.logging.Logger; import java.util.List; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStream.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStream.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStream.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStream.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStream.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStream.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStream.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,6 +29,10 @@ class WindowsLineFeedInputStream extends InputStream { + private final InputStream target; + + private final boolean ensureLineFeedAtEndOfFile; + private boolean slashRSeen = false; private boolean slashNSeen = false; @@ -37,10 +41,6 @@ class WindowsLineFeedInputStream private boolean eofSeen = false; - private final InputStream target; - - private final boolean ensureLineFeedAtEndOfFile; - public WindowsLineFeedInputStream( InputStream in, boolean ensureLineFeedAtEndOfFile ) { this.target = in; Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=1685315&r1=1685314&r2=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Sat Jun 13 20:10:29 2015 @@ -47,7 +47,7 @@ <defaults> <default> <key>package</key> - <value>org.apache.maven.plugin.assembly.model</value> + <value>org.apache.maven.plugins.assembly.model</value> </default> </defaults> <classes> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=1685315&r1=1685314&r2=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Sat Jun 13 20:10:29 2015 @@ -51,7 +51,7 @@ <defaults> <default> <key>package</key> - <value>org.apache.maven.plugin.assembly.model</value> + <value>org.apache.maven.plugins.assembly.model</value> </default> </defaults> <classes>
