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

o Reused util method 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@754502 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-03-14 17:59:31 +00:00
parent fbc5bf92d0
commit 253cb012bc
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -59,7 +59,6 @@ import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.builder.PomTransformer; import org.apache.maven.project.builder.PomTransformer;
import org.apache.maven.project.builder.ProjectUri; import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.project.builder.profile.ProfileContext; import org.apache.maven.project.builder.profile.ProfileContext;
import org.apache.maven.project.processor.ProcessorContext;
import org.apache.maven.project.validation.ModelValidationResult; import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator; import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.RepositorySystem;
@ -751,6 +750,7 @@ public class DefaultMavenProjectBuilder
throws IOException throws IOException
{ {
List<DomainModel> domainModels = new ArrayList<DomainModel>(); List<DomainModel> domainModels = new ArrayList<DomainModel>();
Collection<ModelContainer> profileContainers = profileContext.getActiveProfiles(); Collection<ModelContainer> profileContainers = profileContext.getActiveProfiles();
for ( ModelContainer mc : profileContainers ) for ( ModelContainer mc : profileContainers )
@ -759,15 +759,18 @@ public class DefaultMavenProjectBuilder
transformed.add( new ModelProperty( ProjectUri.xUri, null ) ); transformed.add( new ModelProperty( ProjectUri.xUri, null ) );
for ( ModelProperty mp : mc.getProperties() ) for ( ModelProperty mp : mc.getProperties() )
{ {
if ( mp.getUri().startsWith( ProjectUri.Profiles.Profile.xUri ) && !mp.getUri().equals( ProjectUri.Profiles.Profile.id ) if ( mp.getUri().startsWith( ProjectUri.Profiles.Profile.xUri )
&& !mp.getUri().equals( ProjectUri.Profiles.Profile.id )
&& !mp.getUri().startsWith( ProjectUri.Profiles.Profile.Activation.xUri ) ) && !mp.getUri().startsWith( ProjectUri.Profiles.Profile.Activation.xUri ) )
{ {
transformed.add( new ModelProperty( mp.getUri().replace( ProjectUri.Profiles.Profile.xUri, ProjectUri.xUri ), mp.getResolvedValue() ) ); transformed.add( new ModelProperty( mp.getUri().replace( ProjectUri.Profiles.Profile.xUri,
ProjectUri.xUri ), mp.getResolvedValue() ) );
} }
} }
domainModels.add( new PomClassicDomainModel( transformed ) ); domainModels.add( new PomClassicDomainModel( transformed ) );
} }
return domainModels; return domainModels;
} }
@ -811,22 +814,7 @@ public class DefaultMavenProjectBuilder
//Process Profiles //Process Profiles
ProfileContext profileContext = new ProfileContext( new DefaultModelDataSource( parentDomainModel.getModelProperties(), PomTransformer.MODEL_CONTAINER_FACTORIES ), activeProfileIds, ProfileContext profileContext = new ProfileContext( new DefaultModelDataSource( parentDomainModel.getModelProperties(), PomTransformer.MODEL_CONTAINER_FACTORIES ), activeProfileIds,
inactiveProfileIds, properties ); inactiveProfileIds, properties );
Collection<ModelContainer> profileContainers = profileContext.getActiveProfiles(); domainModels.addAll( transformProfiles( profileContext ) );
for ( ModelContainer mc : profileContainers )
{
List<ModelProperty> transformed = new ArrayList<ModelProperty>();
transformed.add( new ModelProperty( ProjectUri.xUri, null ) );
for ( ModelProperty mp : mc.getProperties() )
{
if ( mp.getUri().startsWith( ProjectUri.Profiles.Profile.xUri ) && !mp.getUri().equals( ProjectUri.Profiles.Profile.id )
&& !mp.getUri().startsWith( ProjectUri.Profiles.Profile.Activation.xUri ) )
{
transformed.add( new ModelProperty( mp.getUri().replace( ProjectUri.Profiles.Profile.xUri, ProjectUri.xUri ), mp.getResolvedValue() ) );
}
}
domainModels.add( new PomClassicDomainModel( transformed ) );
}
if ( !parentDomainModel.matchesParentOf( domainModel ) ) if ( !parentDomainModel.matchesParentOf( domainModel ) )
{ {