svn commit: r1050255 - in /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it: ForkedLauncher.java Verifier.java

[bentmann]

Author: bentmann
Date: Fri Dec 17 00:29:11 2010
New Revision: 1050255

URL: http://svn.apache.org/viewvc?rev=1050255&view=rev
Log:
o Added convenience option to remote debug mvn

Modified:
    
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.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/ForkedLauncher.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java?rev=1050255&r1=1050254&r2=1050255&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
 (original)
+++ 
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
 Fri Dec 17 00:29:11 2010
@@ -46,15 +46,22 @@ class ForkedLauncher
 
     public ForkedLauncher( String mavenHome )
     {
+        this( mavenHome, false );
+    }
+
+    public ForkedLauncher( String mavenHome, boolean debugJvm )
+    {
         this.mavenHome = mavenHome;
 
+        String script = debugJvm ? "mvnDebug" : "mvn";
+
         if ( mavenHome != null )
         {
-            executable = new File( mavenHome, "bin/mvn" ).getPath();
+            executable = new File( mavenHome, "bin/" + script ).getPath();
         }
         else
         {
-            executable = "mvn";
+            executable = script;
         }
     }
 

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=1050255&r1=1050254&r2=1050255&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
 Fri Dec 17 00:29:11 2010
@@ -112,6 +112,8 @@ public class Verifier
 
     private String forkMode;
 
+    private boolean debugJvm = false;
+
     private static MavenLauncher embeddedLauncher;
 
     public Verifier( String basedir )
@@ -1361,7 +1363,7 @@ public class Verifier
             }
             else
             {
-                ForkedLauncher launcher = new ForkedLauncher( defaultMavenHome 
);
+                ForkedLauncher launcher = new ForkedLauncher( 
defaultMavenHome, debugJvm );
 
                 ret = launcher.run( cliArgs, envVars, getBasedir(), logFile );
             }
@@ -2026,6 +2028,16 @@ public class Verifier
         this.forkJvm = Boolean.valueOf( forkJvm );
     }
 
+    public boolean isDebugJvm()
+    {
+        return debugJvm;
+    }
+
+    public void setDebugJvm( boolean debugJvm )
+    {
+        this.debugJvm = debugJvm;
+    }
+
     public String getLocalRepoLayout()
     {
         return localRepoLayout;