diff --git a/manifests/slave.pp b/manifests/slave.pp index 3b607c99c..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, 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. --> - <%= @java_path -%>\java.exe + java.exe -Xrs -jar "<%= @slave_home -%>\<%= @client_jar -%>" -executors <%= @executors -%> <%= @masterurl_flag -%> <%= @labels_flag -%>