svn commit: r1337183 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/puppet/modules/hdp/manifests/java/package.pp

[om...@apache.org]

Author: omalley
Date: Fri May 11 14:35:13 2012
New Revision: 1337183

URL: http://svn.apache.org/viewvc?rev=1337183&view=rev
Log:
AMBARI-203. Fix for duplicate jdk definition (ramya via omalley)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/java/package.pp

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1337183&r1=1337182&r2=1337183&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri May 11 14:35:13 2012
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-203. Fix for duplicate jdk definition (ramya via omalley)
+
   AMBARI-202. Add check to verify jdk path after install (ramya via vgogate)
 
   AMBARI-201. reduce db query logging (hitesh via vgogate)

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/java/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/java/package.pp?rev=1337183&r1=1337182&r2=1337183&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/java/package.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/java/package.pp Fri May 11 14:35:13 2012
@@ -39,11 +39,11 @@ define hdp::java::package(
     path    => ["/bin","/usr/bin/"]
   }
  
-  file { "${java_exec}":
+  file { "${java_exec} ${name}":
   ensure => present
   }   
  
-  anchor{"hdp::java::package::${name}::begin":} -> Exec["${curl_cmd} ${name}"] ->  Exec["${install_cmd} ${name}"] -> File["${java_exec}"] -> anchor{"hdp::java::package::${name}::end":}
+  anchor{"hdp::java::package::${name}::begin":} -> Exec["${curl_cmd} ${name}"] ->  Exec["${install_cmd} ${name}"] -> File["${java_exec} ${name}"] -> anchor{"hdp::java::package::${name}::end":}
   if ($include_artifact_dir == true) {
     Anchor["hdp::java::package::${name}::begin"] -> Hdp::Artifact_dir["java::package::${name}"] -> Exec["${curl_cmd} ${name}"]
   }