Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o patch to pass along the source and location 

Submitted by: Jason Dillon


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@824998 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-10-14 02:05:28 +00:00
parent d5ce7b9092
commit 57f45121c3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View File

@ -28,6 +28,7 @@ import java.util.Iterator;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.HashMap;
import org.apache.maven.model.Dependency; import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.DependencyManagement;
@ -298,7 +299,10 @@ public class DefaultModelBuilder
{ {
boolean strict = request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0; boolean strict = request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0;
Map<String, ?> options = Collections.singletonMap( ModelProcessor.IS_STRICT, Boolean.valueOf( strict ) ); Map<String,Object> options = new HashMap<String,Object>();
options.put(ModelProcessor.IS_STRICT, Boolean.valueOf( strict ));
options.put(ModelProcessor.LOCATION, modelSource.getLocation());
options.put(ModelProcessor.SOURCE, modelSource);
try try
{ {
@ -311,7 +315,7 @@ public class DefaultModelBuilder
throw e; throw e;
} }
options = Collections.singletonMap( ModelProcessor.IS_STRICT, Boolean.FALSE ); options = Collections.singletonMap( ModelProcessor.IS_STRICT, (Object)Boolean.FALSE );
model = modelProcessor.read( modelSource.getInputStream(), options ); model = modelProcessor.read( modelSource.getInputStream(), options );

3
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java
View File

@ -6,4 +6,7 @@ import org.apache.maven.model.locator.ModelLocator;
public interface ModelProcessor public interface ModelProcessor
extends ModelLocator, ModelReader extends ModelLocator, ModelReader
{ {
String LOCATION = "org.apache.maven.model.building.location";
String SOURCE = "org.apache.maven.model.building.source";
} }