You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/10/27 14:32:57 UTC

svn commit: r830178 - /maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java

Author: bentmann
Date: Tue Oct 27 13:32:56 2009
New Revision: 830178

URL: http://svn.apache.org/viewvc?rev=830178&view=rev
Log:
o Restored support for IT execution using embedded Maven

Modified:
    maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java

Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=830178&r1=830177&r2=830178&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Tue Oct 27 13:32:56 2009
@@ -79,6 +79,11 @@
 
     public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( userMavenConfigurationHome, "toolchains.xml" );
 
+    private ClassWorld classWorld;
+
+    // Per-instance container supports fast embedded execution of core ITs
+    private DefaultPlexusContainer container;
+
     private PrintStreamLogger logger;
 
     private ModelProcessor modelProcessor;
@@ -91,6 +96,17 @@
     
     private DefaultSecDispatcher dispatcher;
 
+    public MavenCli()
+    {
+        this( null );
+    }
+
+    // This supports painless invocation by the Verifier during embedded execution of the core ITs
+    public MavenCli( ClassWorld classWorld )
+    {
+        this.classWorld = classWorld;
+    }
+
     public static void main( String[] args )
     {
         int result = main( args, null );
@@ -112,6 +128,17 @@
         return cli.doMain( new CliRequest( args, classWorld ) );
     }
 
+    // This supports painless invocation by the Verifier during embedded execution of the core ITs
+    public int doMain( String[] args, String workingDirectory, PrintStream stdout, PrintStream stderr )
+    {
+        CliRequest cliRequest = new CliRequest( args, classWorld );
+        cliRequest.workingDirectory = workingDirectory;
+        cliRequest.stdout = stdout;
+        cliRequest.stderr = stderr;
+
+        return doMain( cliRequest );
+    }
+
     // TODO: need to externalize CliRequest
     public int doMain( CliRequest cliRequest )
     {
@@ -157,8 +184,15 @@
         {
             cliRequest.stderr = System.err;
         }
-        
-        logger = new PrintStreamLogger( cliRequest.stdout );
+
+        if ( logger == null )
+        {
+            logger = new PrintStreamLogger( cliRequest.stdout );
+        }
+        else
+        {
+            logger.setStream( cliRequest.stdout );
+        }
 
         if ( cliRequest.workingDirectory == null )
         {
@@ -295,17 +329,27 @@
             cliRequest.classWorld = new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() );
         }
 
-        ContainerConfiguration cc = new DefaultContainerConfiguration()
-            .setClassWorld( cliRequest.classWorld )
-            .setName( "maven" );
+        DefaultPlexusContainer container = this.container;
+
+        if ( container == null )
+        {
+            ContainerConfiguration cc = new DefaultContainerConfiguration()
+                .setClassWorld( cliRequest.classWorld )
+                .setName( "maven" );
 
-        DefaultPlexusContainer container = new DefaultPlexusContainer( cc );
+            container = new DefaultPlexusContainer( cc );
 
-        container.setLoggerManager( new MavenLoggerManager( logger ) );
+            container.setLoggerManager( new MavenLoggerManager( logger ) );
 
-        container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() );
-        
-        customizeContainer( container );
+            container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() );
+
+            customizeContainer( container );
+
+            if ( cliRequest.classWorld == classWorld )
+            {
+                this.container = container;
+            }
+        }
 
         maven = container.lookup( Maven.class );