You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/08/19 16:59:04 UTC
svn commit: r687069 - in
/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src:
main/java/org/apache/maven/project/ test/java/org/apache/maven/project/
test/java/org/apache/maven/project/inheritance/
Author: sisbell
Date: Tue Aug 19 07:59:03 2008
New Revision: 687069
URL: http://svn.apache.org/viewvc?rev=687069&view=rev
Log:
Cleaned up unit tests.
Removed:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=687069&r1=687068&r2=687069&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Tue Aug 19 07:59:03 2008
@@ -154,24 +154,6 @@
*/
}
- /**
- * @deprecated
- */
- @Deprecated
- public MavenProject buildFromRepository(Artifact artifact,
- List remoteArtifactRepositories,
- ArtifactRepository localRepository,
- boolean allowStub)
- throws ProjectBuildingException
-
- {
- if (artifact.getFile() == null) {
- artifact.setFile(new File(localRepository.getBasedir(), localRepository.pathOf(artifact)));
- }
- return buildFromRepository(artifact, remoteArtifactRepositories, localRepository);
- }
-
-
public MavenProject buildFromRepository(Artifact artifact,
List remoteArtifactRepositories,
ArtifactRepository localRepository)
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=687069&r1=687068&r2=687069&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java Tue Aug 19 07:59:03 2008
@@ -109,9 +109,12 @@
protected MavenProject getProjectWithDependencies( File pom )
throws Exception
{
+ ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration();
+ configuration.setLocalRepository(getLocalRepository());
+ configuration.setUserProperties(System.getProperties());
try
{
- return projectBuilder.buildWithDependencies( pom, getLocalRepository(), null );
+ return projectBuilder.buildProjectWithDependencies( pom, configuration ).getProject();
}
catch ( Exception e )
{
@@ -130,10 +133,10 @@
protected MavenProject getProject( File pom )
throws Exception
{
- Properties props = System.getProperties();
- // ProfileActivationContext ctx = new DefaultProfileActivationContext( props, false );
-
- return projectBuilder.build( pom, getLocalRepository(), new DefaultProfileManager( getContainer(), ctx ) );
+ ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration();
+ configuration.setLocalRepository(getLocalRepository());
+ configuration.setUserProperties(System.getProperties());
+ return projectBuilder.build( pom, configuration);
}
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?rev=687069&r1=687068&r2=687069&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java Tue Aug 19 07:59:03 2008
@@ -40,10 +40,10 @@
// assertEquals( TestArtifactResolver.class, getContainer().lookup( ArtifactResolver.ROLE ).getClass() );
TestProjectBuilder builder = (TestProjectBuilder) getContainer().lookup( MavenProjectBuilder.ROLE, "test" );
- TestArtifactResolver testArtifactResolver = (TestArtifactResolver) getContainer().lookup( TestArtifactResolver.class.getName() );
+ // TestArtifactResolver testArtifactResolver = (TestArtifactResolver) getContainer().lookup( TestArtifactResolver.class.getName() );
- builder.setArtifactResolver( testArtifactResolver );
- builder.setArtifactMetadataSource( testArtifactResolver.source() );
+ // builder.setArtifactResolver( testArtifactResolver );
+ //builder.setArtifactMetadataSource( testArtifactResolver.source() );
MavenProject project = getProjectWithDependencies( f );
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java?rev=687069&r1=687068&r2=687069&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java Tue Aug 19 07:59:03 2008
@@ -1,11 +1,7 @@
package org.apache.maven.project;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
import java.util.Iterator;
import java.util.List;