You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2010/09/28 22:21:53 UTC
svn commit: r1002344 - in
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly:
archive/task/AddDependencySetsTask.java io/DefaultAssemblyReader.java
Author: jdcasey
Date: Tue Sep 28 20:21:53 2010
New Revision: 1002344
URL: http://svn.apache.org/viewvc?rev=1002344&view=rev
Log:
[MASSEMBLY-263] Improve error message for invalid component descriptor to include location.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=1002344&r1=1002343&r2=1002344&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java Tue Sep 28 20:21:53 2010
@@ -219,21 +219,20 @@ public class AddDependencySetsTask
{
logger.debug( "Adding dependency artifact" + depArtifact.getId() + " after filtering the unpacked contents." );
- final StringBuilder sb = new StringBuilder().append( depArtifact.getGroupId() )
- .append( "_" )
- .append( depArtifact.getArtifactId() )
- .append( "_" )
- .append( depArtifact.getVersion() );
+ final StringBuilder sb =
+ new StringBuilder().append( depArtifact.getGroupId() )
+ .append( "_" )
+ .append( depArtifact.getArtifactId() )
+ .append( "_" )
+ .append( depArtifact.getVersion() );
final String classifier = depArtifact.getClassifier();
if ( classifier != null )
{
- sb.append( "_" )
- .append( classifier );
+ sb.append( "_" ).append( classifier );
}
- sb.append( "." )
- .append( depArtifact.getType() );
+ sb.append( "." ).append( depArtifact.getType() );
final File dir = new File( configSource.getWorkingDirectory(), sb.toString() );
if ( dir.exists() )
@@ -443,8 +442,7 @@ public class AddDependencySetsTask
outputDirectory =
AssemblyFormatUtils.getOutputDirectory( outputDirectory, configSource.getProject(), moduleProject,
- depProject, depProject.getBuild()
- .getFinalName(), configSource );
+ depProject, depProject.getBuild().getFinalName(), configSource );
final String destName =
AssemblyFormatUtils.evaluateFileNameMapping( dependencySet.getOutputFileNameMapping(), depArtifact,
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=1002344&r1=1002343&r2=1002344&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 Tue Sep 28 20:21:53 2010
@@ -215,9 +215,8 @@ public class DefaultAssemblyReader
final List<Assembly> assemblies )
throws AssemblyReadException, InvalidAssemblerConfigurationException
{
- final InputStream resourceAsStream = Thread.currentThread()
- .getContextClassLoader()
- .getResourceAsStream( "assemblies/" + ref + ".xml" );
+ final InputStream resourceAsStream =
+ Thread.currentThread().getContextClassLoader().getResourceAsStream( "assemblies/" + ref + ".xml" );
if ( resourceAsStream == null )
{
@@ -301,15 +300,13 @@ public class DefaultAssemblyReader
{
getLogger().debug( "Ignoring missing assembly descriptor with ID '" + spec
+ "' per configuration.\nLocator output was:\n\n"
- + locator.getMessageHolder()
- .render() );
+ + locator.getMessageHolder().render() );
return null;
}
else
{
throw new AssemblyReadException( "Error locating assembly descriptor: " + spec + "\n\n"
- + locator.getMessageHolder()
- .render() );
+ + locator.getMessageHolder().render() );
}
}
@@ -322,8 +319,7 @@ public class DefaultAssemblyReader
File dir = null;
if ( location.getFile() != null )
{
- dir = location.getFile()
- .getParentFile();
+ dir = location.getFile().getParentFile();
}
final Assembly assembly = readAssembly( r, spec, dir, configSource );
@@ -355,8 +351,7 @@ public class DefaultAssemblyReader
try
{
final Map<String, String> context = new HashMap<String, String>();
- for ( final Object k : System.getProperties()
- .keySet() )
+ for ( final Object k : System.getProperties().keySet() )
{
final String key = (String) k;
context.put( key, System.getProperty( key ) );
@@ -377,18 +372,21 @@ public class DefaultAssemblyReader
}
catch ( final IOException e )
{
- throw new AssemblyReadException( "Error reading descriptor at: " + locationDescription + ": "
- + e.getMessage(), e );
+ throw new AssemblyReadException(
+ "Error reading descriptor: " + locationDescription + ": " + e.getMessage(),
+ e );
}
catch ( final XmlPullParserException e )
{
- throw new AssemblyReadException( "Error reading descriptor at: " + locationDescription + ": "
- + e.getMessage(), e );
+ throw new AssemblyReadException(
+ "Error reading descriptor: " + locationDescription + ": " + e.getMessage(),
+ e );
}
catch ( final AssemblyInterpolationException e )
{
- throw new AssemblyReadException( "Error reading descriptor at: " + locationDescription + ": "
- + e.getMessage(), e );
+ throw new AssemblyReadException(
+ "Error reading descriptor: " + locationDescription + ": " + e.getMessage(),
+ e );
}
finally
{
@@ -455,8 +453,7 @@ public class DefaultAssemblyReader
// allow expressions in path to component descriptor... MASSEMBLY-486
try
{
- location = aee.evaluate( location )
- .toString();
+ location = aee.evaluate( location ).toString();
}
catch ( final Exception eee )
{
@@ -469,6 +466,7 @@ public class DefaultAssemblyReader
{
throw new AssemblyReadException( "Failed to locate component descriptor: " + location );
}
+
Component component = null;
Reader reader = null;
try
@@ -478,11 +476,13 @@ public class DefaultAssemblyReader
}
catch ( final IOException e )
{
- throw new AssemblyReadException( "Error reading component descriptor", e );
+ throw new AssemblyReadException( "Error reading component descriptor: " + location + " (resolved to: "
+ + resolvedLocation.getSpecification() + ")", e );
}
catch ( final XmlPullParserException e )
{
- throw new AssemblyReadException( "Error reading component descriptor", e );
+ throw new AssemblyReadException( "Error reading component descriptor: " + location + " (resolved to: "
+ + resolvedLocation.getSpecification() + ")", e );
}
finally
{