From 9274d98aedba1756c17a8d3f56a1fa1c4eb081a6 Mon Sep 17 00:00:00 2001
From: Nick Meier <nmeier@microsoft.com>
Date: Mon, 2 Dec 2013 08:18:24 -0800
Subject: [PATCH 1/2] Removed absolute path to the java.exe and the java_path
 variable.  Since the current Java package installs a copy of java.exe in the
 system32 directory, we do not need these.

---
 manifests/slave.pp              | 2 +-
 templates/jenkins-slave.xml.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/slave.pp b/manifests/slave.pp
index 3b607c99c..4fa4163cd 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -156,7 +156,7 @@
       # Bug - need to modify windows_java to export the java_path variable
       #
       #$java_path = ${::java::params::java_path}
-      $java_path = "${systemdrive}\\Program Files\\Java\\jre7\\bin"
+      #$java_path = "${systemdrive}\\Program Files\\Java\\jre7\\bin"
   
       file { $slave_home:
         ensure => directory,
diff --git a/templates/jenkins-slave.xml.erb b/templates/jenkins-slave.xml.erb
index 526790e05..9e73b9b16 100644
--- a/templates/jenkins-slave.xml.erb
+++ b/templates/jenkins-slave.xml.erb
@@ -36,7 +36,7 @@ THE SOFTWARE.
     if you'd like to run Jenkins with a specific version of Java, specify a full path to java.exe.
     The following value assumes that you have java in your PATH.
   -->
-  <executable><%= @java_path -%>\java.exe</executable>
+  <executable>java.exe</executable>
   <arguments>-Xrs  -jar "<%= @slave_home -%>\<%= @client_jar -%>" -executors <%= @executors -%> <%= @masterurl_flag -%> <%= @labels_flag -%></arguments>
   <!--
     interactive flag causes the empty black Java window to be displayed.

From eb50075a5516e44ed7ef001894c5a214c3361638 Mon Sep 17 00:00:00 2001
From: Nick Meier <nmeier@microsoft.com>
Date: Mon, 2 Dec 2013 08:21:47 -0800
Subject: [PATCH 2/2] Removed the commented out code for the Java_Path variable

---
 manifests/slave.pp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/manifests/slave.pp b/manifests/slave.pp
index 4fa4163cd..3d6281a0a 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -151,12 +151,6 @@
       windows_common::configuration::feature { 'NET-Framework-Features':
         ensure => present,
       }
-
-      #
-      # Bug - need to modify windows_java to export the java_path variable
-      #
-      #$java_path = ${::java::params::java_path}
-      #$java_path = "${systemdrive}\\Program Files\\Java\\jre7\\bin"
   
       file { $slave_home:
         ensure => directory,