svn commit: r564540 - in /maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker: DefaultInvocationRequest.java InvocationRequest.java MavenCommandLineBuilder.java

[ke...@apache.org]

Author: kenney
Date: Fri Aug 10 03:32:33 2007
New Revision: 564540

URL: http://svn.apache.org/viewvc?view=rev&rev=564540
Log:
Make the JDK configurable

Modified:
    maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
    maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
    maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java

Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java?view=diff&rev=564540&r1=564539&r2=564540
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java Fri Aug 10 03:32:33 2007
@@ -28,6 +28,7 @@
     private File userSettings;
     private String globalChecksumPolicy;
     private String pomFilename;
+    private File javaHome;
     private List profiles;
 
     public InvocationRequest activateReactor( String[] includes, String[] excludes )
@@ -213,6 +214,17 @@
     public InvocationRequest setShellEnvironmentInherited( boolean shellEnvironmentInherited )
     {
         this.shellEnvironmentInherited  = shellEnvironmentInherited;
+        return this;
+    }
+
+    public File getJavaHome()
+    {
+        return javaHome;
+    }
+
+    public InvocationRequest setJavaHome( File javaHome )
+    {
+        this.javaHome = javaHome;
         return this;
     }
 

Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java?view=diff&rev=564540&r1=564539&r2=564540
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java Fri Aug 10 03:32:33 2007
@@ -58,6 +58,8 @@
 
     File getBaseDirectory( File defaultDirectory );
 
+    File getJavaHome();
+
     Properties getProperties();
 
     List getGoals();
@@ -118,6 +120,8 @@
 
     InvocationRequest setBaseDirectory( File basedir );
 
+    InvocationRequest setJavaHome( File javaHome );
+
     InvocationRequest setProperties( Properties properties );
 
     InvocationRequest setGoals( List goals );
@@ -129,5 +133,4 @@
     InvocationRequest setUserSettingsFile( File userSettings );
 
     InvocationRequest setGlobalChecksumPolicy( String globalChecksumPolicy );
-
 }

Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?view=diff&rev=564540&r1=564539&r2=564540
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java Fri Aug 10 03:32:33 2007
@@ -133,6 +133,11 @@
                 }
             }
         }
+
+        if ( request.getJavaHome() != null )
+        {
+            cli.addEnvironment( "JAVA_HOME", request.getJavaHome().getAbsolutePath() );
+        }
     }
 
     protected void setProfiles( InvocationRequest request, Commandline cli )