You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by if...@apache.org on 2013/11/24 06:23:25 UTC

svn commit: r1544916 - in /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it: Classpath3xLauncher.java Embedded3xLauncher.java Verifier.java

Author: ifedorenko
Date: Sun Nov 24 05:23:25 2013
New Revision: 1544916

URL: http://svn.apache.org/r1544916
Log:
deduplicated code in Classpath3x and Embedded3x launchers

Signed-off-by: Igor Fedorenko <ig...@ifedorenko.com>

Removed:
    maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Classpath3xLauncher.java
Modified:
    maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Embedded3xLauncher.java
    maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java

Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Embedded3xLauncher.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Embedded3xLauncher.java?rev=1544916&r1=1544915&r2=1544916&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Embedded3xLauncher.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Embedded3xLauncher.java Sun Nov 24 05:23:25 2013
@@ -127,6 +127,44 @@ class Embedded3xLauncher
         }
     }
 
+    /**
+     * Launches an embedded Maven 3.x instance from the current class path, i.e. the Maven 3.x dependencies are assumed
+     * to be present on the class path.
+     */
+    public static Embedded3xLauncher createFromClasspath()
+        throws LauncherException
+    {
+        ClassLoader coreLoader = Thread.currentThread().getContextClassLoader();
+
+        try
+        {
+            Class<?> cliClass = coreLoader.loadClass( "org.apache.maven.cli.MavenCli" );
+
+            Object mavenCli = cliClass.newInstance();
+
+            Class<?>[] parameterTypes = { String[].class, String.class, PrintStream.class, PrintStream.class };
+            Method doMain = cliClass.getMethod( "doMain", parameterTypes );
+
+            return new Embedded3xLauncher( mavenCli, doMain );
+        }
+        catch ( ClassNotFoundException e )
+        {
+            throw new LauncherException( e.getMessage(), e );
+        }
+        catch ( NoSuchMethodException e )
+        {
+            throw new LauncherException( e.getMessage(), e );
+        }
+        catch ( InstantiationException e )
+        {
+            throw new LauncherException( e.getMessage(), e );
+        }
+        catch ( IllegalAccessException e )
+        {
+            throw new LauncherException( e.getMessage(), e );
+        }
+    }
+
     private static ClassLoader getBootLoader( String mavenHome )
     {
         File bootDir = new File( mavenHome, "boot" );

Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=1544916&r1=1544915&r2=1544916&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Sun Nov 24 05:23:25 2013
@@ -1391,7 +1391,7 @@ public class Verifier
         {
             if ( StringUtils.isEmpty( defaultMavenHome ) )
             {
-                embeddedLauncher = new Classpath3xLauncher();
+                embeddedLauncher = Embedded3xLauncher.createFromClasspath();
             }
             else
             {