Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-08 11:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

o Set POM file before validation to provide better source hint for validation problems

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782283 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-06-06 17:40:50 +00:00
parent b5e672f92b
commit a35801fd1d
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,8 +116,7 @@ private ModelBuildingResult build( ModelSource modelSource, File pomFile, ModelB
List<Profile> activeExternalProfiles = getActiveExternalProfiles( request, profileActivationContext, problems ); List<Profile> activeExternalProfiles = getActiveExternalProfiles( request, profileActivationContext, problems );
Model model = readModel( modelSource, request, problems ); Model model = readModel( modelSource, pomFile, request, problems );
model.setPomFile( pomFile );
List<Model> rawModels = new ArrayList<Model>(); List<Model> rawModels = new ArrayList<Model>();
List<Model> resultModels = new ArrayList<Model>(); List<Model> resultModels = new ArrayList<Model>();
@ -180,7 +179,8 @@ private ModelBuildingResult build( ModelSource modelSource, File pomFile, ModelB
pluginConfigurationExpander.expandPluginConfiguration( resultModel, request ); pluginConfigurationExpander.expandPluginConfiguration( resultModel, request );
} }
validateModel( resultModel, false, request, problems ); ModelValidationResult validationResult = modelValidator.validateEffectiveModel( resultModel, request );
addProblems( resultModel, validationResult, problems );
if ( !problems.isEmpty() ) if ( !problems.isEmpty() )
{ {
@ -201,7 +201,8 @@ private ProfileActivationContext getProfileActivationContext( ModelBuildingReque
return context; return context;
} }
private Model readModel( ModelSource modelSource, ModelBuildingRequest request, List<ModelProblem> problems ) private Model readModel( ModelSource modelSource, File pomFile, ModelBuildingRequest request,
List<ModelProblem> problems )
throws ModelBuildingException throws ModelBuildingException
{ {
Model model; Model model;
@ -226,24 +227,16 @@ Collections.<String, Object> singletonMap( ModelReader.IS_STRICT,
throw new ModelBuildingException( problems ); throw new ModelBuildingException( problems );
} }
validateModel( model, true, request, problems ); model.setPomFile( pomFile );
ModelValidationResult validationResult = modelValidator.validateRawModel( model, request );
addProblems( model, validationResult, problems );
return model; return model;
} }
private void validateModel( Model model, boolean raw, ModelBuildingRequest request, List<ModelProblem> problems ) private void addProblems( Model model, ModelValidationResult result, List<ModelProblem> problems )
{ {
ModelValidationResult result;
if ( raw )
{
result = modelValidator.validateRawModel( model, request );
}
else
{
result = modelValidator.validateEffectiveModel( model, request );
}
if ( result.getMessageCount() > 0 ) if ( result.getMessageCount() > 0 )
{ {
String source = toSourceHint( model ); String source = toSourceHint( model );
@ -384,8 +377,7 @@ private Model readParentLocally( Model childModel, ModelBuildingRequest request,
return null; return null;
} }
Model candidateModel = readModel( new FileModelSource( pomFile ), request, problems ); Model candidateModel = readModel( new FileModelSource( pomFile ), pomFile, request, problems );
candidateModel.setPomFile( pomFile );
String groupId = candidateModel.getGroupId(); String groupId = candidateModel.getGroupId();
if ( groupId == null && candidateModel.getParent() != null ) if ( groupId == null && candidateModel.getParent() != null )
@ -441,7 +433,7 @@ private Model readParentExternally( Model childModel, ModelBuildingRequest reque
throw new ModelBuildingException( problems ); throw new ModelBuildingException( problems );
} }
return readModel( modelSource, request, problems ); return readModel( modelSource, null, request, problems );
} }
private Model getSuperModel() private Model getSuperModel()