Author: bentmann
Date: Mon Apr 19 12:05:57 2010
New Revision: 935539
URL: http://svn.apache.org/viewvc?rev=935539&view=rev
Log:
o Extended location reporting
Modified:
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
Modified:
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java?rev=935539&r1=935538&r2=935539&view=diff
==============================================================================
---
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
Mon Apr 19 12:05:57 2010
@@ -64,7 +64,7 @@ public class DefaultLifecycleBindingsInj
if ( defaultPlugins == null )
{
- problems.add( Severity.ERROR, "Unknown packaging: " + packaging,
null, null );
+ problems.add( Severity.ERROR, "Unknown packaging: " + packaging,
model.getLocation( "packaging" ), null );
}
else if ( !defaultPlugins.isEmpty() )
{
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=935539&r1=935538&r2=935539&view=diff
==============================================================================
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Mon Apr 19 12:05:57 2010
@@ -466,7 +466,8 @@ public class DefaultModelBuilder
}
catch ( InvalidRepositoryException e )
{
- problems.add( Severity.ERROR, "Invalid repository " +
repository.getId() + ": " + e.getMessage(), null, e );
+ problems.add( Severity.ERROR, "Invalid repository " +
repository.getId() + ": " + e.getMessage(),
+ repository.getLocation( "" ), e );
}
}
}
@@ -595,7 +596,7 @@ public class DefaultModelBuilder
{
problems.add( Severity.ERROR, "Invalid packaging for parent
POM "
+ ModelProblemUtils.toSourceHint( parentModel ) + ", must
be \"pom\" but is \""
- + parentModel.getPackaging() + "\"", null, null );
+ + parentModel.getPackaging() + "\"",
parentModel.getLocation( "packaging" ), null );
}
}
else
@@ -640,7 +641,7 @@ public class DefaultModelBuilder
problems.add( Severity.WARNING, "'parent.relativePath' of POM "
+ ModelProblemUtils.toSourceHint( childModel ) + " points at "
+ groupId + ":" + artifactId
+ " instead of " + parent.getGroupId() + ":" +
parent.getArtifactId()
- + ", please verify your project structure", null, null );
+ + ", please verify your project structure",
childModel.getLocation( "parent" ), null );
return null;
}
if ( version == null || !version.equals( parent.getVersion() ) )
@@ -711,7 +712,7 @@ public class DefaultModelBuilder
{
problems.add( Severity.FATAL, "Non-resolvable parent POM "
+ ModelProblemUtils.toId( groupId, artifactId, version ) + "
for "
- + ModelProblemUtils.toId( childModel ) + ": " +
e.getMessage(), null, e );
+ + ModelProblemUtils.toId( childModel ) + ": " +
e.getMessage(), childModel.getLocation( "parent" ), e );
throw new ModelBuildingException( problems.getRootModel(),
problems.getRootModelId(),
problems.getProblems() );
}
@@ -812,7 +813,8 @@ public class DefaultModelBuilder
catch ( UnresolvableModelException e )
{
problems.add( Severity.ERROR, "Non-resolvable import POM "
- + ModelProblemUtils.toId( groupId, artifactId, version
) + ": " + e.getMessage(), null, e );
+ + ModelProblemUtils.toId( groupId, artifactId, version
) + ": " + e.getMessage(),
+ dependency.getLocation( "" ), e );
continue;
}
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java?rev=935539&r1=935538&r2=935539&view=diff
==============================================================================
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
Mon Apr 19 12:05:57 2010
@@ -106,7 +106,8 @@ public class DefaultReportingConverter
{
problems.add( Severity.WARNING, "The <reporting> section is
deprecated"
- + ", please move the reports to the <configuration> section of
the new Maven Site Plugin.", null, null );
+ + ", please move the reports to the <configuration> section of
the new Maven Site Plugin.",
+ reporting.getLocation( "" ), null );
}
for ( ReportPlugin plugin : reporting.getPlugins() )
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java?rev=935539&r1=935538&r2=935539&view=diff
==============================================================================
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
Mon Apr 19 12:05:57 2010
@@ -120,7 +120,7 @@ public class FileProfileActivator
catch ( Exception e )
{
problems.add( Severity.ERROR, "Failed to interpolate file location
" + path + " for profile "
- + profile.getId() + ": " + e.getMessage(), null, e );
+ + profile.getId() + ": " + e.getMessage(), file.getLocation(
missing ? "missing" : "exists" ), e );
return false;
}
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java?rev=935539&r1=935538&r2=935539&view=diff
==============================================================================
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
Mon Apr 19 12:05:57 2010
@@ -57,7 +57,7 @@ public class JdkVersionProfileActivator
if ( version.length() <= 0 )
{
problems.add( Severity.ERROR, "Failed to determine Java
version for profile " + profile.getId(),
- null, null );
+ activation.getLocation( "jdk" ), null );
return false;
}
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java?rev=935539&r1=935538&r2=935539&view=diff
==============================================================================
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
Mon Apr 19 12:05:57 2010
@@ -62,7 +62,7 @@ public class PropertyProfileActivator
if ( name == null || name.length() <= 0 )
{
problems.add( Severity.ERROR, "The property name is
required to activate the profile "
- + profile.getId(), null, null );
+ + profile.getId(), property.getLocation( "" ), null );
return false;
}
