You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/07/17 02:30:16 UTC
svn commit: r794919 - in /maven/components/trunk/maven-embedder/src:
main/java/org/apache/maven/cli/ main/java/org/apache/maven/embedder/
main/java/org/apache/maven/embedder/execution/
test/java/org/apache/maven/embedder/ test/java/org/apache/maven/emb...
Author: jvanzyl
Date: Fri Jul 17 00:30:15 2009
New Revision: 794919
URL: http://svn.apache.org/viewvc?rev=794919&view=rev
Log:
o removing many old embedder tests that are performing what is now done far better by the underlying components
o remove ties to the Configuration class in the populator which means it can be moved back to the core
Removed:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/project/
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=794919&r1=794918&r2=794919&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Fri Jul 17 00:30:15 2009
@@ -144,18 +144,10 @@
}
MavenEmbedder mavenEmbedder;
- MavenEmbedderLogger logger;
try
{
mavenEmbedder = new MavenEmbedder( configuration );
-
- logger = mavenEmbedder.getLogger();
-
- if ( mavenEmbedder.isOffline( request ) )
- {
- logger.info( "You are working in offline mode." );
- }
}
catch ( MavenEmbedderException e )
{
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=794919&r1=794918&r2=794919&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Fri Jul 17 00:30:15 2009
@@ -118,7 +118,7 @@
private Configuration configuration;
- private MavenExecutionRequest request;
+ //private MavenExecutionRequest request;
// ----------------------------------------------------------------------------
// Constructors
@@ -130,10 +130,12 @@
start( embedderConfiguration );
}
+ /*
public MavenExecutionRequest getDefaultRequest()
{
return request;
}
+ */
// ----------------------------------------------------------------------
// Accessors
@@ -144,6 +146,7 @@
return classWorld;
}
+ /*
public ArtifactRepository getLocalRepository()
{
return request.getLocalRepository();
@@ -153,6 +156,7 @@
{
return request.getSettings();
}
+ */
public MavenEmbedderLogger getLogger()
{
@@ -262,65 +266,6 @@
}
// ----------------------------------------------------------------------
- // Project
- // ----------------------------------------------------------------------
-
- public MavenProject readProject( File mavenProject )
- throws ProjectBuildingException, MavenExecutionException
- {
- return readProject( mavenProject, request );
- }
-
- private MavenProject readProject( File mavenProject, MavenExecutionRequest request )
- throws ProjectBuildingException, MissingModuleException
- {
- getLogger().debug( "Building MavenProject instance: " + mavenProject );
-
- return projectBuilder.build( mavenProject, request.getProjectBuildingRequest() );
- }
-
- /**
- * This method is used to grab the list of dependencies that belong to a project so that a UI
- * can be populated. For example, a list of libraries that are used by an Eclipse, Netbeans, or
- * IntelliJ project.
- */
-
- // currently in m2eclipse each project is read read a single project for dependencies
- // Project
- // Exceptions
- // explicit for exceptions where coordinate are involved.
- // m2eclipse is not using the topological sorting at all because it keeps track itself.
-
- public MavenExecutionResult readProjectWithDependencies( MavenExecutionRequest request )
- {
- MavenExecutionResult result = new DefaultMavenExecutionResult();
-
- try
- {
- request = populator.populateDefaults( request, configuration );
- }
- catch ( MavenEmbedderException e )
- {
- return result.addException( e );
- }
-
- try
- {
- MavenProjectBuildingResult projectBuildingResult = projectBuilder.buildProjectWithDependencies( request.getPom(), request.getProjectBuildingRequest() );
-
- result.setProject( projectBuildingResult.getProject() );
-
- result.setArtifactResolutionResult( projectBuildingResult.getArtifactResolutionResult() );
-
- return result;
- }
- catch ( ProjectBuildingException e )
- {
- return result.addException( e );
- }
- }
-
- // ----------------------------------------------------------------------
// Lifecycle
// ----------------------------------------------------------------------
@@ -397,9 +342,9 @@
// This is temporary as we can probably cache a single request and use it for default values and
// simply cascade values in from requests used for individual executions.
- request = new DefaultMavenExecutionRequest();
-
- populator.populateDefaults( request, configuration );
+ //request = new DefaultMavenExecutionRequest();
+ //
+ //populator.populateDefaults( request, configuration );
}
catch ( ComponentLookupException e )
{
@@ -496,18 +441,6 @@
return configuration;
}
- // ----------------------------------------------------------------------
- // Start of new embedder API
- // ----------------------------------------------------------------------
-
- public boolean isOffline( MavenExecutionRequest request )
- throws MavenEmbedderException
- {
- request = populator.populateDefaults( request, configuration );
-
- return request.isOffline();
- }
-
public MavenExecutionResult execute( MavenExecutionRequest request )
{
LoggerManager loggerManager = container.getLoggerManager();
@@ -520,7 +453,7 @@
try
{
- request = populator.populateDefaults( request, configuration );
+ request = populator.populateDefaults( request );
}
catch ( MavenEmbedderException e )
{
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=794919&r1=794918&r2=794919&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Fri Jul 17 00:30:15 2009
@@ -23,7 +23,6 @@
import org.apache.maven.Maven;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -36,12 +35,10 @@
import org.apache.maven.toolchain.ToolchainsBuilder;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
@Component(role = MavenExecutionRequestPopulator.class)
public class DefaultMavenExecutionRequestPopulator
- extends AbstractLogEnabled
implements MavenExecutionRequestPopulator
{
//TODO: this needs to be pushed up to the front-end
@@ -54,45 +51,6 @@
@Requirement
private ToolchainsBuilder toolchainsBuilder;
- public MavenExecutionRequest populateDefaults( MavenExecutionRequest request, Configuration configuration )
- throws MavenEmbedderException
- {
- // copy configuration to request
- if ( request.getSettings() == null )
- {
- if ( configuration.getGlobalSettingsFile() != null )
- {
- request.setGlobalSettingsFile( configuration.getGlobalSettingsFile() );
- }
-
- if ( configuration.getUserSettingsFile() != null )
- {
- request.setUserSettingsFile( configuration.getUserSettingsFile() );
- }
- }
-
- String localRepositoryPath = null;
-
- if ( request.getLocalRepositoryPath() != null )
- {
- localRepositoryPath = request.getLocalRepositoryPath().getAbsolutePath();
- }
-
- if ( StringUtils.isEmpty( localRepositoryPath ) && ( configuration.getLocalRepository() != null ) )
- {
- localRepositoryPath = configuration.getLocalRepository().getAbsolutePath();
- }
-
- if ( !StringUtils.isEmpty( localRepositoryPath ) )
- {
- request.setLocalRepositoryPath( localRepositoryPath );
- }
-
- // populate the defaults
-
- return populateDefaults( request );
- }
-
private void pom( MavenExecutionRequest request )
{
if ( request.getPom() != null && !request.getPom().isAbsolute() )
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java?rev=794919&r1=794918&r2=794919&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java Fri Jul 17 00:30:15 2009
@@ -19,17 +19,11 @@
* under the License.
*/
-import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
public interface MavenExecutionRequestPopulator
{
- String ROLE = MavenExecutionRequestPopulator.class.getName();
-
- MavenExecutionRequest populateDefaults( MavenExecutionRequest request, Configuration configuration )
- throws MavenEmbedderException;
-
MavenExecutionRequest populateDefaults( MavenExecutionRequest request )
throws MavenEmbedderException;
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=794919&r1=794918&r2=794919&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Fri Jul 17 00:30:15 2009
@@ -23,10 +23,8 @@
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Set;
import junit.framework.TestCase;
@@ -57,7 +55,6 @@
protected MavenEmbedder mavenEmbedder;
-
protected void setUp()
throws Exception
{
@@ -321,11 +318,13 @@
// Repository
// ----------------------------------------------------------------------
+ /*
public void testLocalRepositoryRetrieval()
throws Exception
{
assertNotNull( mavenEmbedder.getLocalRepository().getBasedir() );
}
+ */
// ----------------------------------------------------------------------
// Model Reading
@@ -343,79 +342,6 @@
assertEquals( "org.apache.maven", model.getGroupId() );
}
- public void testProjectReading()
- throws Exception
- {
- MavenExecutionRequest request = new DefaultMavenExecutionRequest().setShowErrors( true ).setPom( getPomFile() );
-
- MavenExecutionResult result = mavenEmbedder.readProjectWithDependencies( request );
-
- assertNoExceptions( result );
-
- assertEquals( "org.apache.maven", result.getProject().getGroupId() );
-
- Set<Artifact> artifacts = result.getProject().getArtifacts();
-
- assertEquals( 1, artifacts.size() );
-
- artifacts.iterator().next();
- }
-
- public void testProjectReadingNoDependencies()
- throws Exception
- {
- MavenExecutionRequest request =
- new DefaultMavenExecutionRequest().setShowErrors( true ).setPom(
- getPomFile( "pom-without-dependencies.xml" ) );
-
- MavenExecutionResult result = mavenEmbedder.readProjectWithDependencies( request );
-
- assertNoExceptions( result );
-
- assertEquals( new ArrayList<Artifact>(), new ArrayList<Artifact>( result.getProject().getArtifacts() ) );
- }
-
- public void testProjectReading_FromChildLevel_ScmInheritanceCalculations()
- throws Exception
- {
- File pomFile = new File( basedir, "src/test/projects/readProject-withScmInheritance/modules/child1/pom.xml" );
-
- MavenProject project = mavenEmbedder.readProject( pomFile );
- assertNotNull(project.getScm());
- assertEquals( "http://host/viewer?path=/trunk/parent/modules/child1", project.getScm().getUrl() );
- assertEquals( "scm:svn:http://host/trunk/parent/modules/child1", project.getScm().getConnection() );
- assertEquals( "scm:svn:https://host/trunk/parent/modules/child1", project.getScm().getDeveloperConnection() );
- }
-
- public void testProjectReading_SkipMissingModuleSilently()
- throws Exception
- {
- File pomFile = new File( basedir,
- "src/test/projects/readProject-missingModuleIgnored/pom.xml" );
-
- mavenEmbedder.readProject( pomFile );
- }
-
- public void testProjectReadingWithDistributionStatus()
- throws Exception
- {
- File pom = new File( basedir, "src/test/resources/pom-with-distribution-status.xml" );
- MavenExecutionRequest request = new DefaultMavenExecutionRequest().setShowErrors( true )
- .setPom( pom );
-
- MavenProject project = mavenEmbedder.readProject( pom );
-
- assertEquals( "deployed", project.getDistributionManagement().getStatus() );
-
- MavenExecutionResult result = mavenEmbedder.readProjectWithDependencies( request );
-
- assertNoExceptions( result );
-
- assertEquals( "org.apache.maven", result.getProject().getGroupId() );
-
- assertEquals( "deployed", result.getProject().getDistributionManagement().getStatus() );
- }
-
// ----------------------------------------------------------------------------
// Model Writing
// ----------------------------------------------------------------------------
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java?rev=794919&r1=794918&r2=794919&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java Fri Jul 17 00:30:15 2009
@@ -53,7 +53,7 @@
MavenEmbedder embedder = new MavenEmbedder( configuration );
- assertNotNull( embedder.getLocalRepository().getBasedir() );
+ //assertNotNull( embedder.getLocalRepository().getBasedir() );
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
.setBaseDirectory( projectDirectory )