Author: krosenvold
Date: Thu Nov 13 17:27:58 2014
New Revision: 1639406
URL: http://svn.apache.org/r1639406
Log:
todo cleanup
Modified:
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/io/DefaultAssemblyReader.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/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
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=1639406&r1=1639405&r2=1639406&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 17:27:58 2014
@@ -19,8 +19,6 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.DeferredFileOutputStream;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?rev=1639406&r1=1639405&r2=1639406&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
Thu Nov 13 17:27:58 2014
@@ -19,25 +19,7 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.maven.execution.MavenSession;
+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;
@@ -61,6 +43,7 @@ import org.apache.maven.shared.io.locati
import org.apache.maven.shared.io.location.Location;
import org.apache.maven.shared.io.location.Locator;
import org.apache.maven.shared.io.location.LocatorStrategy;
+import org.apache.maven.shared.utils.ReaderFactory;
import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
import org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource;
import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
@@ -71,6 +54,18 @@ import org.codehaus.plexus.util.Director
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* @version $Id$
*/
@@ -133,46 +128,21 @@ public class DefaultAssemblyReader
if ( ( descriptorSourceDirectory != null ) &&
descriptorSourceDirectory.isDirectory() )
{
- locator.setStrategies( Collections.singletonList( new
RelativeFileLocatorStrategy(
-
descriptorSourceDirectory ) ) );
+ locator.setStrategies(
+ Collections.singletonList( new RelativeFileLocatorStrategy(
descriptorSourceDirectory ) ) );
final DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir( descriptorSourceDirectory );
- scanner.setIncludes( new String[] { "**/*.xml" } );
+ scanner.setIncludes( new String[]{ "**/*.xml" } );
scanner.addDefaultExcludes();
- try
- {
- scanner.scan();
- }
- // FIXME: plexus-utils >= 1.3-SNAPSHOT should fix this.
- catch ( final NullPointerException e )
- {
- final StackTraceElement frameZero = e.getStackTrace()[0];
-
- if ( "org.codehaus.plexus.util.DirectoryScanner".equals(
frameZero.getClassName() )
- && "scandir".equals( frameZero.getMethodName() ) )
- {
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "Caught filesystem error while
scanning directories..."
- + "using zero-length list as
the result.", e );
- }
- }
- else
- {
- throw e;
- }
- }
+ scanner.scan();
final String[] paths = scanner.getIncludedFiles();
- if ( paths != null )
+ for ( String path : paths )
{
- for ( String path : paths )
- {
- addAssemblyFromDescriptor( path, locator, configSource,
assemblies );
- }
+ addAssemblyFromDescriptor( path, locator, configSource,
assemblies );
}
}
@@ -180,7 +150,8 @@ public class DefaultAssemblyReader
{
if ( configSource.isIgnoreMissingDescriptor() )
{
- getLogger().debug( "Ignoring missing assembly descriptors per
configuration. See messages above for specifics." );
+ getLogger().debug(
+ "Ignoring missing assembly descriptors per configuration.
See messages above for specifics." );
}
else
{
@@ -201,7 +172,8 @@ public class DefaultAssemblyReader
return assemblies;
}
- public Assembly getAssemblyForDescriptorReference( final String ref, final
AssemblerConfigurationSource configSource )
+ public Assembly getAssemblyForDescriptorReference( final String ref,
+ final
AssemblerConfigurationSource configSource )
throws AssemblyReadException, InvalidAssemblerConfigurationException
{
return addAssemblyForDescriptorReference( ref, configSource, new
ArrayList<Assembly>( 1 ) );
@@ -234,19 +206,22 @@ public class DefaultAssemblyReader
}
}
+ Reader reader = null;
try
{
- // TODO use ReaderFactory.newXmlReader() when plexus-utils is
upgraded to 1.4.5+
- final Assembly assembly =
- readAssembly( new InputStreamReader( resourceAsStream, "UTF-8"
), ref, null, configSource );
+ reader = ReaderFactory.newXmlReader( resourceAsStream );
+ final Assembly assembly = readAssembly( reader, ref, null,
configSource );
assemblies.add( assembly );
return assembly;
}
- catch ( final UnsupportedEncodingException e )
+ catch ( final IOException e )
{
- // should not occur since UTF-8 support is mandatory
- throw new AssemblyReadException( "Encoding not supported for
descriptor with ID '" + ref + "'" );
+ throw new AssemblyReadException( "Problem with descriptor with ID
'" + ref + "'", e );
+ }
+ finally
+ {
+ IOUtils.closeQuietly( reader );
}
}
@@ -271,8 +246,7 @@ public class DefaultAssemblyReader
Reader r = null;
try
{
- // TODO use ReaderFactory.newXmlReader() when plexus-utils is
upgraded to 1.4.5+
- r = new InputStreamReader( new FileInputStream( descriptor ),
"UTF-8" );
+ r = ReaderFactory.newXmlReader( descriptor );
final Assembly assembly =
readAssembly( r, descriptor.getAbsolutePath(),
descriptor.getParentFile(), configSource );
@@ -308,16 +282,15 @@ public class DefaultAssemblyReader
}
else
{
- throw new AssemblyReadException( "Error locating assembly
descriptor: " + spec + "\n\n"
- + locator.getMessageHolder().render() );
+ throw new AssemblyReadException(
+ "Error locating assembly descriptor: " + spec + "\n\n" +
locator.getMessageHolder().render() );
}
}
Reader r = null;
try
{
- // TODO use ReaderFactory.newXmlReader() when plexus-utils is
upgraded to 1.4.5+
- r = new InputStreamReader( location.getInputStream(), "UTF-8" );
+ r = ReaderFactory.newXmlReader( location.getInputStream() );
File dir = null;
if ( location.getFile() != null )
@@ -348,29 +321,9 @@ public class DefaultAssemblyReader
{
Assembly assembly;
- final File basedir = configSource.getBasedir();
final MavenProject project = configSource.getProject();
-
try
{
- final Map<String, String> context = new HashMap<String, String>();
- final MavenSession session = configSource.getMavenSession();
-
- Properties commandLineProperties =
mergeExecutionPropertiesWithSystemProperties( session );
-
- for ( final Enumeration<Object> e = commandLineProperties.keys();
e.hasMoreElements(); )
- {
- final String key = (String) e.nextElement();
- if ( key == null || key.trim().length() < 1 )
- {
- continue;
- }
-
- context.put( key, commandLineProperties.getProperty( key ) );
- }
-
- context.put( "basedir", basedir.getAbsolutePath() );
-
final AssemblyXpp3Reader r = new AssemblyXpp3Reader();
assembly = r.read( reader );
@@ -385,20 +338,17 @@ public class DefaultAssemblyReader
}
catch ( final IOException e )
{
- throw new AssemblyReadException(
- "Error reading descriptor: " +
locationDescription + ": " + e.getMessage(),
+ throw new AssemblyReadException( "Error reading descriptor: " +
locationDescription + ": " + e.getMessage(),
e );
}
catch ( final XmlPullParserException e )
{
- throw new AssemblyReadException(
- "Error reading descriptor: " +
locationDescription + ": " + e.getMessage(),
+ throw new AssemblyReadException( "Error reading descriptor: " +
locationDescription + ": " + e.getMessage(),
e );
}
catch ( final AssemblyInterpolationException e )
{
- throw new AssemblyReadException(
- "Error reading descriptor: " +
locationDescription + ": " + e.getMessage(),
+ throw new AssemblyReadException( "Error reading descriptor: " +
locationDescription + ": " + e.getMessage(),
e );
}
finally
@@ -417,29 +367,11 @@ public class DefaultAssemblyReader
public static FixedStringSearchInterpolator createProjectInterpolator(
MavenProject project )
{
return FixedStringSearchInterpolator.create(
- new PrefixedPropertiesValueSource(
InterpolationConstants.PROJECT_PROPERTIES_PREFIXES, project.getProperties(),
true ),
+ new PrefixedPropertiesValueSource(
InterpolationConstants.PROJECT_PROPERTIES_PREFIXES,
+ project.getProperties(), true ),
new PrefixedObjectValueSource(
InterpolationConstants.PROJECT_PREFIXES, project, true ) );
}
- public static Properties mergeExecutionPropertiesWithSystemProperties(
MavenSession session )
- {
- Properties commandLineProperties = System.getProperties();
- if ( session != null )
- {
- commandLineProperties = new Properties();
- if ( session.getExecutionProperties() != null )
- {
- commandLineProperties.putAll( session.getExecutionProperties()
);
- }
-
- if ( session.getUserProperties() != null )
- {
- commandLineProperties.putAll( session.getUserProperties() );
- }
- }
- return commandLineProperties;
- }
-
private void debugPrintAssembly( final String message, final Assembly
assembly )
{
final StringWriter sWriter = new StringWriter();
@@ -449,8 +381,8 @@ public class DefaultAssemblyReader
}
catch ( final IOException e )
{
- getLogger().debug( "Failed to print debug message with assembly
descriptor listing, and message: "
- + message, e );
+ getLogger().debug(
+ "Failed to print debug message with assembly descriptor
listing, and message: " + message, e );
}
getLogger().debug( message + "\n\n" + sWriter.toString() + "\n\n" );
@@ -458,10 +390,10 @@ public class DefaultAssemblyReader
/**
* Add the contents of all included components to main assembly
- *
- * @param assembly
- * @param assemblyDir
- * @throws AssemblyReadException
+ *
+ * @param assembly The assembly
+ * @param assemblyDir The assembly directory
+ * @throws AssemblyReadException .
*/
protected void mergeComponentsWithMainAssembly( final Assembly assembly,
final File assemblyDir,
final
AssemblerConfigurationSource configSource )
@@ -512,12 +444,12 @@ public class DefaultAssemblyReader
catch ( final IOException e )
{
throw new AssemblyReadException( "Error reading component
descriptor: " + location + " (resolved to: "
- + resolvedLocation.getSpecification() + ")", e );
+ +
resolvedLocation.getSpecification() + ")", e );
}
catch ( final XmlPullParserException e )
{
throw new AssemblyReadException( "Error reading component
descriptor: " + location + " (resolved to: "
- + resolvedLocation.getSpecification() + ")", e );
+ +
resolvedLocation.getSpecification() + ")", e );
}
finally
{
@@ -530,9 +462,9 @@ public class DefaultAssemblyReader
/**
* Add the content of a single Component to main assembly
- *
- * @param component
- * @param assembly
+ *
+ * @param component The component
+ * @param assembly The assembly
*/
protected void mergeComponentWithAssembly( final Component component,
final Assembly assembly )
{
@@ -587,7 +519,7 @@ public class DefaultAssemblyReader
if ( !siteDirectory.exists() )
{
throw new InvalidAssemblerConfigurationException(
- "site did not
exist in the target directory - please run site:site before creating the
assembly" );
+ "site did not exist in the target directory - please run
site:site before creating the assembly" );
}
getLogger().info( "Adding site directory to assembly : " +
siteDirectory );
Modified:
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/plugin/assembly/utils/AssemblyFormatUtils.java?rev=1639406&r1=1639405&r2=1639406&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/plugin/assembly/utils/AssemblyFormatUtils.java
Thu Nov 13 17:27:58 2014
@@ -398,10 +398,6 @@ public final class AssemblyFormatUtils
{
String value = expression;
- // TODO: This is BAD! Accessors SHOULD NOT change the behavior of the
object.
- // [jdcasey; 16-Aug-1007] This is fixed in SVN, just waiting for it to
pass out of legacy.
- artifact.isSnapshot();
-
final FixedStringSearchInterpolator interpolator =
FixedStringSearchInterpolator.create(
moduleArtifactInterpolator( moduleArtifact ),
moduleProjectInterpolator,
artifactInterpolator( artifact ), artifactProjectInterpolator,
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?rev=1639406&r1=1639405&r2=1639406&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
Thu Nov 13 17:27:58 2014
@@ -40,7 +40,6 @@ import java.io.IOException;
import java.util.Collections;
import junit.framework.TestCase;
-import org.easymock.EasyMock;
import org.easymock.classextension.EasyMockSupport;
public class DependencySetAssemblyPhaseTest
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?rev=1639406&r1=1639405&r2=1639406&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
Thu Nov 13 17:27:58 2014
@@ -34,14 +34,12 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.ModuleSet;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.codehaus.plexus.archiver.ArchivedFileSet;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.FileSet;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.easymock.EasyMock;
import org.easymock.classextension.EasyMockSupport;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java?rev=1639406&r1=1639405&r2=1639406&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
Thu Nov 13 17:27:58 2014
@@ -953,7 +953,6 @@ public class DefaultAssemblyReaderTest
}
catch ( final AssemblyReadException e )
{
- e.printStackTrace();
fail( "Setting ignoreMissingDescriptor == true (true flag in
performReadAssemblies, above) should NOT produce an exception." );
}
}
