continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r548766 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
Date Tue, 19 Jun 2007 15:31:33 GMT
Author: evenisse
Date: Tue Jun 19 08:31:33 2007
New Revision: 548766

URL: http://svn.apache.org/viewvc?view=rev&rev=548766
Log:
Add java home and builder if they are defined

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java?view=diff&rev=548766&r1=548765&r2=548766
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
Tue Jun 19 08:31:33 2007
@@ -23,6 +23,7 @@
 import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
+import org.apache.maven.continuum.installation.InstallationService;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.system.Installation;
@@ -85,12 +86,12 @@
         String javaHome = getJavaHomeValue( buildDefinition );
         if ( !StringUtils.isEmpty( javaHome ) )
         {
-            // TODO what todo with this ?
+            envVars.put( getInstallationService().getEnvVar( InstallationService.JDK_TYPE
), javaHome );
         }
         Installation builder = profile.getBuilder();
         if ( builder != null )
         {
-            // TODO what todo with this ?
+            envVars.put( builder.getVarName(), builder.getVarValue() );
         }
         envVars.putAll( getEnvironmentVariables( buildDefinition ) );
         return envVars;



Mime
View raw message