You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/04/19 13:38:27 UTC
svn commit: r935534 - in /maven/maven-3/branches/MNG-1803:
maven-core/src/main/java/org/apache/maven/project/
maven-model-builder/src/main/java/org/apache/maven/model/building/
Author: bentmann
Date: Mon Apr 19 11:38:27 2010
New Revision: 935534
URL: http://svn.apache.org/viewvc?rev=935534&view=rev
Log:
o Added request option to enable location tracking
Modified:
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.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/building/DefaultModelBuildingRequest.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=935534&r1=935533&r2=935534&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Mon Apr 19 11:38:27 2010
@@ -110,6 +110,7 @@ public class DefaultProjectBuilder
request.setPomFile( pomFile );
request.setModelSource( modelSource );
+ request.setLocationTracking( pomFile != null );
ModelBuildingResult result;
try
@@ -310,6 +311,7 @@ public class DefaultProjectBuilder
request.setPomFile( pomFile );
request.setTwoPhaseBuilding( true );
+ request.setLocationTracking( true );
request.setModelCache( modelCache );
DefaultModelBuildingListener listener =
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=935534&r1=935533&r2=935534&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 11:38:27 2010
@@ -346,7 +346,7 @@ public class DefaultModelBuilder
try
{
boolean strict = request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0;
- InputSource source = strict ? new InputSource() : null;
+ InputSource source = request.isLocationTracking() ? new InputSource() : null;
Map<String, Object> options = new HashMap<String, Object>();
options.put( ModelProcessor.IS_STRICT, Boolean.valueOf( strict ) );
Modified: maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java?rev=935534&r1=935533&r2=935534&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java Mon Apr 19 11:38:27 2010
@@ -47,6 +47,8 @@ public class DefaultModelBuildingRequest
private boolean twoPhaseBuilding;
+ private boolean locationTracking;
+
private List<Profile> profiles;
private List<String> activeProfileIds;
@@ -155,6 +157,18 @@ public class DefaultModelBuildingRequest
return this;
}
+ public boolean isLocationTracking()
+ {
+ return locationTracking;
+ }
+
+ public DefaultModelBuildingRequest setLocationTracking( boolean locationTracking )
+ {
+ this.locationTracking = locationTracking;
+
+ return this;
+ }
+
public List<Profile> getProfiles()
{
if ( profiles == null )
Modified: maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java?rev=935534&r1=935533&r2=935534&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java Mon Apr 19 11:38:27 2010
@@ -104,6 +104,18 @@ class FilterModelBuildingRequest
return this;
}
+ public boolean isLocationTracking()
+ {
+ return request.isLocationTracking();
+ }
+
+ public FilterModelBuildingRequest setLocationTracking( boolean locationTracking )
+ {
+ request.setLocationTracking( locationTracking );
+
+ return this;
+ }
+
public List<Profile> getProfiles()
{
return request.getProfiles();
Modified: maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java?rev=935534&r1=935533&r2=935534&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java Mon Apr 19 11:38:27 2010
@@ -156,6 +156,22 @@ public interface ModelBuildingRequest
ModelBuildingRequest setTwoPhaseBuilding( boolean twoPhaseBuilding );
/**
+ * Indicates whether the model should track the line/column number of the model source from which it was parsed.
+ *
+ * @return {@code true} if location tracking is enabled, {@code false} otherwise.
+ */
+ boolean isLocationTracking();
+
+ /**
+ * Enables/disables the tracking of line/column numbers for the model source being parsed. By default, input
+ * locations are not tracked.
+ *
+ * @param locationTracking {@code true} to enable location tracking, {@code false} to disable it.
+ * @return This request, never {@code null}.
+ */
+ ModelBuildingRequest setLocationTracking( boolean locationTracking );
+
+ /**
* Gets the external profiles that should be considered for model building.
*
* @return The external profiles that should be considered for model building, never {@code null}.