svn commit: r291775 - in /maven/components/trunk/maven-embedder/src: main/java/org/apache/maven/embedder/MavenEmbedder.java test/java/org/apache/maven/embedder/MavenEmbedderTest.java

[jvanzyl]

Author: jvanzyl
Date: Mon Sep 26 15:49:03 2005
New Revision: 291775

URL: http://svn.apache.org/viewcvs?rev=291775&view=rev
Log:
o adding a test which shows that a project can be built from the embedder,
now we need to work on the events and logging.

Modified:
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java

Modified: 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=291775&r1=291774&r2=291775&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
 Mon Sep 26 15:49:03 2005
@@ -278,9 +278,7 @@
 
         rm.setFailureBehavior( ReactorManager.FAIL_AT_END );
 
-        // The first project is blacklisted?
-
-        rm.blackList( (MavenProject) projects.get( 0 ) );
+        //rm.blackList( (MavenProject) projects.get( 0 ) );
 
         MavenSession session = new MavenSession( embedder.getContainer(),
                                                  settings,
@@ -290,6 +288,8 @@
                                                  goals,
                                                  
executionRootDirectory.getAbsolutePath() );
 
+        session.setUsingPOMsFromFilesystem( true );
+
         MavenExecutionResponse response = lifecycleExecutor.execute( session,
                                                                      rm,
                                                                      
session.getEventDispatcher() );
@@ -383,6 +383,8 @@
             mavenProjectBuilder = (MavenProjectBuilder) embedder.lookup( 
MavenProjectBuilder.ROLE );
 
             artifactRepositoryFactory = (ArtifactRepositoryFactory) 
embedder.lookup( ArtifactRepositoryFactory.ROLE );
+
+            lifecycleExecutor = (LifecycleExecutor) embedder.lookup( 
LifecycleExecutor.ROLE );
 
             // 
----------------------------------------------------------------------
             // If an explicit local repository has not been set then we will 
use the

Modified: 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=291775&r1=291774&r2=291775&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
 Mon Sep 26 15:49:03 2005
@@ -4,10 +4,13 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.monitor.event.EventDispatcher;
+import org.apache.maven.monitor.event.DefaultEventDispatcher;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
-import java.util.List;
 import java.util.Set;
+import java.util.Collections;
 
 public class MavenEmbedderTest
     extends TestCase
@@ -53,9 +56,19 @@
     public void testPhaseExecution()
         throws Exception
     {
-        File pomFile = new File( basedir, 
"src/test/embedder-test-project/pom.xml" );
+        File testDirectory = new File( basedir, 
"src/test/embedder-test-project" );
+
+        File targetDirectory = new File( basedir, 
"target/embedder-test-project" );
+
+        FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
+
+        File pomFile = new File( targetDirectory, "pom.xml" );
 
         MavenProject pom = maven.readProjectWithDependencies( pomFile );
+
+        EventDispatcher eventDispatcher = new DefaultEventDispatcher();
+
+        maven.execute( pom, Collections.singletonList( "package" ), 
eventDispatcher, targetDirectory );
     }
 
     // ----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]