Author: carlos
Date: Wed Oct 24 15:25:28 2007
New Revision: 588059

URL: http://svn.apache.org/viewvc?rev=588059&view=rev
Log:
Store the pom File object in the execution request instead of its path

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

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=588059&r1=588058&r2=588059&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
 Wed Oct 24 15:25:28 2007
@@ -323,7 +323,7 @@
 
         try
         {
-            pluginManager.verifyPlugin( plugin, project, session );
+        pluginManager.verifyPlugin( plugin, project, session );
         }
         finally
         {
@@ -478,7 +478,7 @@
 
             Map handlers = findArtifactTypeHandlers( project );
 
-            //TODO: ok this is crappy, now there are active collections so 
when new artifact handlers
+            //TODO: ok this is crappy, now there are active collections so 
when new artifact handlers 
             // enter the system they should be available.
 
             artifactHandlerManager.addHandlers( handlers );
@@ -508,7 +508,7 @@
         try
         {
             projectBuildingResult = mavenProjectBuilder.buildWithDependencies(
-                new File( request.getPomFile() ),
+                request.getPom(),
                 request.getLocalRepository(),
                 request.getProfileManager() );
         }
@@ -652,8 +652,8 @@
 
         try
         {
-            ContainerConfiguration cc = new DefaultContainerConfiguration()
-                .addComponentDiscoverer( new MavenPluginDiscoverer() )
+            ContainerConfiguration cc = new DefaultContainerConfiguration()    
            
+                .addComponentDiscoverer( new MavenPluginDiscoverer() )         
       
                 .addComponentDiscoveryListener( new MavenPluginCollector() )
                 .setClassWorld( classWorld ).setParentContainer( 
configuration.getParentContainer() ).setName( "embedder" );
 


Reply via email to