Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 34753 invoked from network); 19 Jun 2007 15:31:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jun 2007 15:31:54 -0000 Received: (qmail 91395 invoked by uid 500); 19 Jun 2007 15:31:58 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 91376 invoked by uid 500); 19 Jun 2007 15:31:58 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 91363 invoked by uid 99); 19 Jun 2007 15:31:58 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2007 08:31:58 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2007 08:31:54 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 12A101A981A; Tue, 19 Jun 2007 08:31:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070619153134.12A101A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;