Author: bentmann
Date: Fri May 29 21:44:35 2009
New Revision: 780119
URL: http://svn.apache.org/viewvc?rev=780119&view=rev
Log:
o Switched tests over to use new interface
Added:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
- copied, changed from r780110,
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenProjectBuilder.java
Removed:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenProjectBuilder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=780119&r1=780118&r2=780119&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
Fri May 29 21:44:35 2009
@@ -6,6 +6,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
+...@deprecated
public interface ProjectBuilderConfiguration
extends ProjectBuildingRequest
{
@@ -29,24 +30,6 @@
boolean isProcessPlugins();
- /**
- * Controls the level of validation to perform on processed models. By
default, models are validated in strict mode.
- *
- * @param lenientValidation A flag whether validation should be lenient
instead of strict. For building of projects,
- * strict validation should be used to ensure proper building.
For the mere retrievel of dependencies
- * during artifact resolution, lenient validation should be
used to account for models of poor quality.
- * @return This configuration, never {...@code null}.
- */
- ProjectBuilderConfiguration setLenientValidation( boolean
lenientValidation );
-
- /**
- * Gets the level of validation to perform on processed models.
- *
- * @return {...@code true} if lenient validation is enabled and only the
dependency information is to be validated,
- * {...@code false} if strict validation is enabled and the entire
model is validated.
- */
- boolean istLenientValidation();
-
// Profiles
/**
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=780119&r1=780118&r2=780119&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Fri May 29 21:44:35 2009
@@ -35,21 +35,21 @@
public abstract class AbstractMavenProjectTestCase
extends PlexusTestCase
{
- protected MavenProjectBuilder projectBuilder;
+ protected ProjectBuilder projectBuilder;
protected void setUp()
throws Exception
{
super.setUp();
- if ( getContainer().hasComponent( MavenProjectBuilder.class, "test" ) )
+ if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) )
{
- projectBuilder = lookup( MavenProjectBuilder.class, "test" );
+ projectBuilder = lookup( ProjectBuilder.class, "test" );
}
else
{
// default over to the main project builder...
- projectBuilder = lookup( MavenProjectBuilder.class );
+ projectBuilder = lookup( ProjectBuilder.class );
}
}
@@ -62,7 +62,7 @@
super.tearDown();
}
- protected MavenProjectBuilder getProjectBuilder()
+ protected ProjectBuilder getProjectBuilder()
{
return projectBuilder;
}
@@ -117,7 +117,7 @@
protected MavenProject getProjectWithDependencies( File pom )
throws Exception
{
- ProjectBuilderConfiguration configuration = new
DefaultProjectBuilderConfiguration();
+ ProjectBuildingRequest configuration = new
DefaultProjectBuildingRequest();
configuration.setLocalRepository( getLocalRepository() );
configuration.setRemoteRepositories( Arrays.asList( new
ArtifactRepository[] {} ) );
configuration.setProcessPlugins( false );
@@ -143,7 +143,7 @@
protected MavenProject getProject( File pom )
throws Exception
{
- ProjectBuilderConfiguration configuration = new
DefaultProjectBuilderConfiguration();
+ ProjectBuildingRequest configuration = new
DefaultProjectBuildingRequest();
configuration.setLocalRepository( getLocalRepository() );
return projectBuilder.build( pom, configuration );
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=780119&r1=780118&r2=780119&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
Fri May 29 21:44:35 2009
@@ -27,14 +27,13 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.model.Plugin;
import org.codehaus.plexus.util.FileUtils;
public class DefaultMavenProjectBuilderTest
extends AbstractMavenProjectTestCase
{
- private List filesToDelete = new ArrayList();
+ private List<File> filesToDelete = new ArrayList<File>();
private File localRepoDir;
@@ -44,7 +43,7 @@
{
super.setUp();
- projectBuilder = lookup( MavenProjectBuilder.class );
+ projectBuilder = lookup( ProjectBuilder.class );
localRepoDir = new File( System.getProperty( "java.io.tmpdir" ),
"local-repo." + System.currentTimeMillis() );
localRepoDir.mkdirs();
@@ -60,9 +59,9 @@
if ( !filesToDelete.isEmpty() )
{
- for ( Iterator it = filesToDelete.iterator(); it.hasNext(); )
+ for ( Iterator<File> it = filesToDelete.iterator(); it.hasNext(); )
{
- File file = (File) it.next();
+ File file = it.next();
if ( file.exists() )
{
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?rev=780119&r1=780118&r2=780119&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
Fri May 29 21:44:35 2009
@@ -33,7 +33,7 @@
throws Exception
{
//super.setUp();
- projectBuilder = lookup( MavenProjectBuilder.class, "classpath" );
+ projectBuilder = lookup( ProjectBuilder.class, "classpath" );
}
@Override
Copied:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
(from r780110,
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenProjectBuilder.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java?p2=maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java&p1=maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenProjectBuilder.java&r1=780110&r2=780119&rev=780119&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
Fri May 29 21:44:35 2009
@@ -6,19 +6,15 @@
import java.io.FileNotFoundException;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-...@component(role=MavenProjectBuilder.class,hint="classpath")
-public class TestMavenProjectBuilder
- extends DefaultMavenProjectBuilder
+...@component(role=ProjectBuilder.class,hint="classpath")
+public class TestProjectBuilder
+ extends DefaultProjectBuilder
{
- @Requirement(hint="classpath")
- private RepositorySystem repositorySystem;
@Override
- public MavenProject buildFromRepository( Artifact artifact,
ProjectBuilderConfiguration configuration )
+ public MavenProject build( Artifact artifact, ProjectBuildingRequest
request )
throws ProjectBuildingException
{
if ( "maven-test".equals( artifact.getGroupId() ) )
@@ -38,6 +34,6 @@
{
return new MavenProject();
}
- return build( artifact.getFile(), configuration );
+ return build( artifact.getFile(), request );
}
}
\ No newline at end of file
