Author: jvanzyl
Date: Tue Dec 16 15:12:01 2008
New Revision: 727210
URL: http://svn.apache.org/viewvc?rev=727210&view=rev
Log:
o we don't need to deal with import models right now, all we care about in the
near future are mixins. this is an attempt
to simplify the API enabling me to more easily create the specification tests
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=727210&r1=727209&r2=727210&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Dec 16 15:12:01 2008
@@ -548,12 +548,10 @@
try
{
mavenProject = projectBuilder.buildFromLocalPath(
projectDescriptor,
- Arrays.asList(
-
getSuperProject( config, projectDescriptor, true ).getModel() ),
-
null,
-
interpolatorProperties,
-
resolver,
-
config );
+ Arrays.asList(
getSuperProject( config, projectDescriptor, true ).getModel() ),
+
interpolatorProperties,
+ resolver,
+ config );
}
catch ( IOException e )
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java?rev=727210&r1=727209&r2=727210&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
Tue Dec 16 15:12:01 2008
@@ -19,15 +19,15 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilderConfiguration;
-import org.apache.maven.shared.model.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
+import org.apache.maven.shared.model.InterpolatorProperty;
/**
* Provides services for building maven projects from models.
@@ -36,9 +36,8 @@
{
public PomClassicDomainModel buildModel( File pom,
List<Model> inheritedModels,
- Collection<ImportModel>
importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
- DefaultPomArtifactResolver
resolver )
+ PomArtifactResolver resolver )
throws IOException;
/**
@@ -55,9 +54,8 @@
*/
MavenProject buildFromLocalPath( File pom,
List<Model> inheritedModels,
- Collection<ImportModel> importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
- DefaultPomArtifactResolver resolver,
+ PomArtifactResolver resolver,
ProjectBuilderConfiguration
projectBuilderConfiguration )
throws IOException;
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=727210&r1=727209&r2=727210&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Tue Dec 16 15:12:01 2008
@@ -38,6 +38,7 @@
import org.apache.maven.project.builder.ArtifactModelContainerFactory;
import org.apache.maven.project.builder.IdModelContainerFactory;
import org.apache.maven.project.builder.DefaultPomArtifactResolver;
+import org.apache.maven.project.builder.PomArtifactResolver;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.builder.PomClassicDomainModelFactory;
import org.apache.maven.project.builder.PomClassicTransformer;
@@ -74,14 +75,9 @@
private Logger logger;
- public DefaultProjectBuilder()
- {
- }
-
public PomClassicDomainModel buildModel( File pom, List<Model>
inheritedModels,
- Collection<ImportModel>
importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
- DefaultPomArtifactResolver
resolver )
+ PomArtifactResolver resolver )
throws IOException
{
if ( pom == null )
@@ -156,7 +152,7 @@
PomClassicDomainModel transformedDomainModel = (
(PomClassicDomainModel) ctx.transform( domainModels,
transformer,
transformer,
-
importModels,
+
Collections.EMPTY_LIST,
properties,
listeners ) );
transformedDomainModel.setParentFile( parentFile );
@@ -165,15 +161,13 @@
}
public MavenProject buildFromLocalPath( File pom, List<Model>
inheritedModels,
- Collection<ImportModel>
importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
- DefaultPomArtifactResolver
resolver,
+ PomArtifactResolver resolver,
ProjectBuilderConfiguration
projectBuilderConfiguration )
throws IOException
{
PomClassicDomainModel domainModel = buildModel( pom,
inheritedModels,
- importModels,
interpolatorProperties,
resolver );
@@ -221,7 +215,7 @@
}
private List<DomainModel> getDomainModelParentsFromRepository(
PomClassicDomainModel domainModel,
-
DefaultPomArtifactResolver artifactResolver )
+
PomArtifactResolver artifactResolver )
throws IOException
{
List<DomainModel> domainModels = new ArrayList<DomainModel>();
@@ -261,7 +255,7 @@
* @throws IOException
*/
private List<DomainModel> getDomainModelParentsFromLocalPath(
PomClassicDomainModel domainModel,
-
DefaultPomArtifactResolver artifactResolver,
+
PomArtifactResolver artifactResolver,
File
projectDirectory )
throws IOException
{
