Author: jvanzyl
Date: Thu May 14 13:52:03 2009
New Revision: 774768
URL: http://svn.apache.org/viewvc?rev=774768&view=rev
Log:
o fixinga bunch of embedder tests, 8 left to fix
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=774768&r1=774767&r2=774768&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Thu May 14 13:52:03 2009
@@ -126,7 +126,7 @@
try
{
ProjectSorter projectSorter = new ProjectSorter( projects.values()
);
-
+
session = new MavenSession( container, request, result,
projectSorter.getSortedProjects() );
}
catch ( CycleDetectedException e )
@@ -163,7 +163,7 @@
}
result.setTopologicallySortedProjects( session.getProjects() );
-
+
result.setProject( session.getTopLevelProject() );
return result;
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=774768&r1=774767&r2=774768&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Thu May 14 13:52:03 2009
@@ -71,8 +71,9 @@
if ( projects.size() > 0 )
{
this.currentProject = projects.get( 0 );
+ this.topLevelProject = projects.get( 0 );
}
- this.projects = projects;
+ this.projects = projects;
}
@Deprecated
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=774768&r1=774767&r2=774768&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu May 14 13:52:03 2009
@@ -106,7 +106,7 @@
public MavenProject build( File pomFile, ProjectBuilderConfiguration
configuration )
throws ProjectBuildingException
- {
+ {
MavenProject project = projectCache.get( pomFile.getAbsolutePath() );
if ( project != null )
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=774768&r1=774767&r2=774768&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Thu May 14 13:52:03 2009
@@ -24,22 +24,24 @@
public interface MavenProjectBuilder
{
- // site
+ MavenProject build( File projectFile, ProjectBuilderConfiguration
configuration )
+ throws ProjectBuildingException;
+
+ MavenProject buildFromRepository( Artifact projectArtifact,
ProjectBuilderConfiguration configuration )
+ throws ProjectBuildingException;
+
+ //TODO maven-site-plugin
MavenProject build( File project, ArtifactRepository localRepository,
ProfileManager profileManager )
throws ProjectBuildingException;
-
- // remote-resources-plugin
+
+ //TODO remote-resources-plugin
MavenProject buildFromRepository( Artifact artifact,
List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository
)
- throws ProjectBuildingException;
-
- MavenProject build( File project, ProjectBuilderConfiguration
configuration )
throws ProjectBuildingException;
+ // TODO: This also doesn't really belong here as it's a mix of project
builder and artifact resolution and belongs
+ // in an integration component like the embedder.
MavenProjectBuildingResult buildProjectWithDependencies( File project,
ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
-
- MavenProject buildFromRepository( Artifact artifact,
ProjectBuilderConfiguration configuration )
- throws ProjectBuildingException;
// TODO: this is only to provide a project for plugins that don't need a
project to execute but need some
// of the values from a MavenProject. Ideally this should be something
internal and nothing outside Maven
Modified:
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=774768&r1=774767&r2=774768&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Thu May 14 13:52:03 2009
@@ -514,7 +514,6 @@
public boolean isOffline( MavenExecutionRequest request )
throws MavenEmbedderException
{
- // first, grab defaults including settings, in case
<offline>true</offline> is set.
request = populator.populateDefaults( request, configuration );
return request.isOffline();
@@ -525,9 +524,7 @@
LoggerManager loggerManager = container.getLoggerManager();
int oldThreshold = loggerManager.getThreshold();
-
-
-
+
try
{
loggerManager.setThresholds( request.getLoggingLevel() );
Modified:
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=774768&r1=774767&r2=774768&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Thu May 14 13:52:03 2009
@@ -22,6 +22,7 @@
import java.util.Properties;
import java.util.Set;
+import org.apache.maven.Maven;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.embedder.Configuration;
@@ -72,6 +73,8 @@
{
executionProperties( request, configuration );
+ pom( request, configuration );
+
settings( request, configuration );
localRepository( request, configuration );
@@ -81,7 +84,7 @@
profileManager( request, configuration );
processSettings( request, configuration );
-
+
return request;
}
@@ -113,6 +116,34 @@
}
}
}
+
+ private void pom( MavenExecutionRequest request, Configuration
configuration )
+ {
+ //
------------------------------------------------------------------------
+ // POM
+ //
+ // If we are not given a specific POM file, but passed a base directory
+ // then we will use a release POM in the directory provide, or and then
+ // look for the standard POM.
+ //
------------------------------------------------------------------------
+
+ if ( ( request.getPom() != null ) && (
request.getPom().getParentFile() != null ) )
+ {
+ request.setBaseDirectory( request.getPom().getParentFile() );
+ }
+ else if ( ( request.getPom() == null ) && ( request.getBaseDirectory()
!= null ) )
+ {
+ File pom = new File( request.getBaseDirectory(), Maven.POMv4 );
+
+ request.setPom( pom );
+ }
+ // TODO: Is this correct?
+ else if ( request.getBaseDirectory() == null )
+ {
+ request.setBaseDirectory( new File( System.getProperty( "user.dir"
) ) );
+ }
+ }
+
private void processSettings( MavenExecutionRequest request, Configuration
configuration )
throws MavenEmbedderException
