You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by hi...@apache.org on 2012/06/08 01:26:42 UTC

svn commit: r1347830 - in /incubator/ambari/branches/ambari-186: ./ hmc/archive/ hmc/html/ hmc/images/ hmc/package/rpm/ hmc/package/rpm/SOURCES/ hmc/package/rpm/SPECS/ hmc/php/conf/ hmc/php/frontend/ hmc/puppet/modules/hdp-nagios/files/ hmc/puppet/modu...

Author: hitesh
Date: Thu Jun  7 23:26:41 2012
New Revision: 1347830

URL: http://svn.apache.org/viewvc?rev=1347830&view=rev
Log:
AMBARI-537. Cleaning up references. (Contributed by Vikram)

Removed:
    incubator/ambari/branches/ambari-186/hmc/archive/
    incubator/ambari/branches/ambari-186/hmc/package/rpm/SOURCES/hmc_hdp.repo
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/templates/hdp103.repo.erb
    incubator/ambari/branches/ambari-186/hmc/tests/php/puppet/test.db
Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/html/header.htmli
    incubator/ambari/branches/ambari-186/hmc/images/logo-micro.gif
    incubator/ambari/branches/ambari-186/hmc/images/logo-small.gif
    incubator/ambari/branches/ambari-186/hmc/images/logo.jpg
    incubator/ambari/branches/ambari-186/hmc/package/rpm/SOURCES/hmc.init.in
    incubator/ambari/branches/ambari-186/hmc/package/rpm/SPECS/hmc.spec
    incubator/ambari/branches/ambari-186/hmc/package/rpm/hmc-php53.spec
    incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc
    incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/files/check_oozie_status.sh
    incubator/ambari/branches/ambari-186/hmc/tests/php/orchestrator/test.php
    incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_dashboard.spec
    incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec
    incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec
    incubator/ambari/branches/ambari-186/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh
    incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html
    incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html
    incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html
    incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js
    incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html
    incubator/ambari/branches/ambari-186/mon_dashboard/test/dataServices/jmx/data/sample_hbasemaster_jmx.json

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 23:26:41 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-537. Cleaning up references. (Vikram via Hitesh)
+
   AMBARI-528. Fix oozie smoke test failure (Ramya via Vikram)
 
   AMBARI-525. Javascript should not pass flag in case of post install add nodes. (Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/html/header.htmli
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/header.htmli?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/header.htmli (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/header.htmli Thu Jun  7 23:26:41 2012
@@ -1,10 +1,10 @@
 <!-- START HEADER -->
     <div class="container">
       <header>
-        <a href="http://www.hortonworks.com" target="_blank">
+        <a href="http://incubator.apache.org/projects/ambari.html" target="_blank">
           <img src="./logo.jpg"/>
         </a>
-        <section id="headerText">Hortonworks Data Platform</section>
+        <section id="headerText">Ambari</section>
       </header>
     </div>
 <!-- END HEADER -->

Modified: incubator/ambari/branches/ambari-186/hmc/images/logo-micro.gif
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/images/logo-micro.gif?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/ambari/branches/ambari-186/hmc/images/logo-small.gif
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/images/logo-small.gif?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/ambari/branches/ambari-186/hmc/images/logo.jpg
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/images/logo.jpg?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/ambari/branches/ambari-186/hmc/package/rpm/SOURCES/hmc.init.in
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/package/rpm/SOURCES/hmc.init.in?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/package/rpm/SOURCES/hmc.init.in (original)
+++ incubator/ambari/branches/ambari-186/hmc/package/rpm/SOURCES/hmc.init.in Thu Jun  7 23:26:41 2012
@@ -45,82 +45,6 @@ fi
 cp /etc/puppet/auth.conf /etc/puppet/master/
 cp /etc/puppet/puppet.conf /etc/puppet/master/
 
-checkLicense() {
-  if [ ! -f /var/run/hmc/license ]
-  then
-    echo "Do you agree to Oracle's Java License at"
-    while true; do
-      read -p "/usr/share/hmc/licenses/ORACLE_JDK_LICENSE.txt?(y/n)" yn
-      case $yn in
-        [Yy]* ) touch /var/run/hmc/license; break;;
-        [Nn]* ) echo "Exiting"; exit 0;;
-        * ) echo "Please answer yes or no.";;
-      esac
-    done
-  fi
-}
-
-downloadJDK() {
-  jdk64="jdk-6u26-linux-x64.bin"
-  jdk32="jdk-6u26-linux-i586.bin"
-
-  echo "Downloading JDK binaries. This may take a few minutes"
-
-  echo "Downloading 64-bit JDK binaries"
-  curl --connect-timeout 10 -f -L --output /var/run/hmc/downloads/${jdk64}.tmp "https://s3.amazonaws.com/dev.hortonworks.com/ARTIFACTS/jdk-6u26-linux-x64.bin"
-  ret=$?
-  if [[ "$ret" != "0" ]]; then
-    echo "Failed to download 64-bit JDK"
-    return 1
-  fi
-
-  curl --connect-timeout 10 -f -L --output /var/run/hmc/downloads/${jdk64}.md5.tmp "https://s3.amazonaws.com/dev.hortonworks.com/ARTIFACTS/jdk-6u26-linux-x64.bin.md5"
-  ret=$?
-  if [[ "$ret" != "0" ]]; then
-    echo "Failed to download 64-bit JDK md5"
-    return 1
-  fi
-
-  echo "Downloading 32-bit JDK binaries"
-  curl --connect-timeout 10 -f -L --output /var/run/hmc/downloads/${jdk32}.tmp "https://s3.amazonaws.com/dev.hortonworks.com/ARTIFACTS/jdk-6u26-linux-i586.bin"
-  ret=$?
-  if [[ "$ret" != "0" ]]; then
-    echo "Failed to download 32-bit JDK"
-    return 1
-  fi
-
-  curl --connect-timeout 10 -f -L --output /var/run/hmc/downloads/${jdk32}.md5.tmp "https://s3.amazonaws.com/dev.hortonworks.com/ARTIFACTS/jdk-6u26-linux-i586.bin.md5"
-  ret=$?
-  if [[ "$ret" != "0" ]]; then
-    echo "Failed to download 32-bit JDK md5"
-    return 1
-  fi
-
-  md5Str=`cat /var/run/hmc/downloads/${jdk64}.md5.tmp`
-  echo "${md5Str}  /var/run/hmc/downloads/${jdk64}.tmp" > /var/run/hmc/downloads/${jdk64}.md5
-
-  md5sum --status --check /var/run/hmc/downloads/${jdk64}.md5
-  ret=$?
-  if [[ "$ret" != "0" ]]; then
-    echo "Failed to match md5 checksum for 64-bit JDK"
-    return 1
-  fi
-
-  md5Str=`cat /var/run/hmc/downloads/${jdk32}.md5.tmp`
-  echo "${md5Str}  /var/run/hmc/downloads/${jdk32}.tmp" > /var/run/hmc/downloads/${jdk32}.md5
-
-  md5sum --status --check /var/run/hmc/downloads/${jdk32}.md5
-  ret=$?
-  if [[ "$ret" != "0" ]]; then
-    echo "Failed to match md5 checksum for 32-bit JDK"
-    return 1
-  fi
-
-  cp -f /var/run/hmc/downloads/${jdk64}.tmp /var/run/hmc/downloads/${jdk64}
-  cp -f /var/run/hmc/downloads/${jdk32}.tmp /var/run/hmc/downloads/${jdk32}
-  return 0
-}
-
 checkHDPRepo() {
   if [[ ! -f /etc/yum.repos.d/hdp.repo ]]; then
     echo "Please install hdp repo before starting hmc"
@@ -141,29 +65,6 @@ checkJDK() {
   jdk64="jdk-6u26-linux-x64.bin"
   jdk32="jdk-6u26-linux-i586.bin"
 
-  checkLicense
-
-  if [[ ! -f /var/run/hmc/downloads/$jdk64 || ! -f /var/run/hmc/downloads/$jdk32 ]]; then
-    while true; do
-      read -p "Would you like us to download the JDK binaries for you?(y/n)" dyn
-      case $dyn in
-        [Yy]* )
-               downloadJDK
-               ret=$?
-               if [[ "$ret" != "0" ]]; then
-                 echo -n "Failed to download JDK correctly"
-               fi
-               cleanupFiles="/var/run/hmc/downloads/${jdk64}.tmp /var/run/hmc/downloads/${jdk64}.md5 /var/run/hmc/downloads/${jdk64}.md5.tmp /var/run/hmc/downloads/${jdk32}.tmp /var/run/hmc/downloads/${jdk32}.md5 /var/run/hmc/downloads/${jdk32}.md5.tmp"
-               rm -f ${cleanupFiles}
-               break
-               ;;
-        [Nn]* ) break;;
-        * ) echo "Please answer yes or no.";;
-      esac
-    done
-  fi
-
-
   if [[ ! -f /var/run/hmc/downloads/$jdk64 || ! -f /var/run/hmc/downloads/$jdk32 ]]; then
     echo "Please download $jdk64 and $jdk32 from Oracle to /var/run/hmc/downloads/"
     exit 1

Modified: incubator/ambari/branches/ambari-186/hmc/package/rpm/SPECS/hmc.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/package/rpm/SPECS/hmc.spec?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/package/rpm/SPECS/hmc.spec (original)
+++ incubator/ambari/branches/ambari-186/hmc/package/rpm/SPECS/hmc.spec Thu Jun  7 23:26:41 2012
@@ -25,10 +25,10 @@
 Summary: HMC
 Name: hmc
 Version: 1.0.0
-URL: http://hortonworks.com
+URL: http://incubator.apache.org/projects/ambari.html
 Release: 1%{?dist}
 License: Apache License, Version 2.0
-Vendor: Hortonworks <hm...@hortonworks.com>
+Vendor: Apache Software Foundation (ambari-dev@incubator.apache.org)
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 Source1: hmc.init.in
@@ -166,5 +166,5 @@ rm -rf /var/run/hmc/puppetmaster.boot
 #%clean
 #%__rm -rf $RPM_BUILD_ROOT
 %changelog
-* Wed Apr 04 2012 Hortonworks <am...@hortonworks.com>
+* Thu Jun 07 2012 Ambari <am...@incubator.apache.org>
 - Initial version

Modified: incubator/ambari/branches/ambari-186/hmc/package/rpm/hmc-php53.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/package/rpm/hmc-php53.spec?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/package/rpm/hmc-php53.spec (original)
+++ incubator/ambari/branches/ambari-186/hmc/package/rpm/hmc-php53.spec Thu Jun  7 23:26:41 2012
@@ -25,10 +25,10 @@
 Summary: HMC for PHP 5.3
 Name: hmc-php53
 Version: 0.0.1
-URL: http://hortonworks.com
+URL: http://incubator.apache.org/projects/ambari.html
 Release: 2%{?dist}
 License: Apache License, Version 2.0
-Vendor: Hortonworks <hm...@hortonworks.com>
+Vendor: Apache Software Foundation <am...@incubator.apache.org>
 Group: System Environment/Base
 Source: hmc-%{version}.tar.gz
 Source1: hmc.init.in
@@ -152,5 +152,5 @@ rm -rf /var/run/hmc/puppetmaster.boot
 #%clean
 #%__rm -rf $RPM_BUILD_ROOT
 %changelog
-* Wed Apr 04 2012 Hortonworks <am...@hortonworks.com>
+* Thu Jun 07 2012 Ambari <am...@incubator.apache.org>
 - Initial version

Modified: incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc Thu Jun  7 23:26:41 2012
@@ -1,10 +1,10 @@
 <?php
-$RES['app.name']="Hortonworks Management Center";
-$RES['page.title']="Hortonworks Management Center";
-$RES['page.footer.body']="Hortonworks &copy; 2012";
-$RES['topnav.help.link']="http://docs.hortonworks.com/CURRENT/index.htm#Troubleshooting_HDP_Deployment/Troubleshooting_HDP_Deployment.htm";
-$RES['welcome.header']="Welcome to Hortonworks Management Center!";
-$RES['welcome.body']="<p>Hortonworks Management Center makes it easy for you to install, configure, and manage your Hadoop cluster.</p><p>First, we will walk you through setting up your cluster with a step-by-step wizard.</p>";
+$RES['app.name']="Ambari";
+$RES['page.title']="Ambari";
+$RES['page.footer.body']="";
+$RES['topnav.help.link']="";
+$RES['welcome.header']="Welcome to Ambari!";
+$RES['welcome.body']="";
 $RES['welcome.note']="Before you proceed, make sure you have performed all the pre-installation steps.";
 $RES['welcome.submit.label']="Get started";
 $RES['installFailed.header']="Cluster installation failed";
@@ -14,7 +14,7 @@ $RES['reinstall.header']="You have not s
 $RES['reinstall.body']="We'll walk you through setting up your cluster with a 7-step wizard.";
 $RES['reinstall.submit.label']="Let's get started!";
 $RES['uninstallFailed.header']="Cluster uninstallation failed";
-$RES['uninstallFailed.body']="Failed to uninstall the cluster.  <a href='http://docs.hortonworks.com/CURRENT/index.htm#Troubleshooting_HDP_Deployment/Troubleshooting_HDP_Deployment.htm' target='_blank'>View the troubleshooting guide.</a>";
+$RES['uninstallFailed.body']="Failed to uninstall the cluster";
 $RES['common.sshUsername.label']="SSH Username";
 $RES['common.sshPrivateKeyFile.label']="SSH Private Key File for <i>root</i>";
 $RES['common.hostsFile.label']="Hosts File (newline-delimited list of hostnames)";
@@ -57,4 +57,4 @@ $RES['uninstallWizard.pageSummary.body']
 $RES['uninstallWizard.wipeout.label']="Perform wipe out (delete all data)";
 $RES['uninstallWizard.submit.label']="Uninstall Cluster";
 $RES['initWizard.configureClusterAdvanced.validation.error']="We've encountered invalid settings.";
-?>
\ No newline at end of file
+?>

Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php Thu Jun  7 23:26:41 2012
@@ -389,7 +389,6 @@ function validateConfigs($svcConfigs) {
       scheduler_name|org.apache.hadoop.mapred.CapacityTaskScheduler
       nagios_web_login|nagiosadmin
       nagios_web_password|admin
-      nagios_contact|nagiosadmin@hortonworks.com
       hadoop_heapsize|1024
       namenode_heapsize|1024
       namenode_opt_newsize|200

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/files/check_oozie_status.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/files/check_oozie_status.sh?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/files/check_oozie_status.sh (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/files/check_oozie_status.sh Thu Jun  7 23:26:41 2012
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 # OOZIE_URL is of the form http://<hostname>:<port>/oozie
-# OOZIE_URL: http://hortonworks-sandbox.localdomain:11000/oozie
 HOST=$1
 PORT=$2
 JAVA_HOME=$3

Modified: incubator/ambari/branches/ambari-186/hmc/tests/php/orchestrator/test.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/tests/php/orchestrator/test.php?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/tests/php/orchestrator/test.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/tests/php/orchestrator/test.php Thu Jun  7 23:26:41 2012
@@ -31,7 +31,7 @@ class TestDB extends OrchestratorDB {
   private $hbase_regionserver;
 
   function __construct($puppet) {
-    parent::__construct("/homes/hortonmu/HMC/src/php/db/test.db", "DataCluster", $puppet);
+    parent::__construct("./test.db", "DataCluster", $puppet);
 
     $this->namenode = new ServiceComponent($clusterName, "namenode", "hdfs", State::UNINSTALLED, $this, $puppet, FALSE);
     $this->secondary_namenode = new ServiceComponent($clusterName, "secondary_namenode", "hdfs", State::UNINSTALLED, $this, $puppet, FALSE);
@@ -196,7 +196,7 @@ print_r($zookeeper->stop());
 */
 
 $puppet = new MockPuppetInvoker();
-$db = new OrchestratorDB("/homes/hortonmu/HMC/src/php/db/test.db", "DataCluster", $puppet);
+$db = new OrchestratorDB("./test.db", "DataCluster", $puppet);
 $cluster = new Cluster($clusterName, $db, $puppet);
 $t0 = new Transaction(0, 0, 0);
 print_r($cluster->deployHDP($t0));

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_dashboard.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_dashboard.spec?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_dashboard.spec (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_dashboard.spec Thu Jun  7 23:26:41 2012
@@ -25,10 +25,10 @@
 Summary: HDP Monitoring Dashboard Frontend
 Name: hdp_mon_dashboard
 Version: 0.0.1
-URL: http://hortonworks.com
+URL: http://incubator.apache.org/projects/ambari.html
 Release: 2 
 License: Apache License, Version 2.0
-Vendor: Hortonworks <am...@hortonworks.com>
+Vendor: Apache Software Foundation (ambari-dev@incubator.apache.org)
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -66,5 +66,5 @@ echo "Alias /hdp %{_prefix}/share/hdp" >
 %__rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Feb 17 2011 Hortonworks <am...@hortonworks.com>
+* Thu Jun 07 2012 Ambari <am...@incubator.apache.org>
 - Initial version

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_ganglia_addons.spec Thu Jun  7 23:26:41 2012
@@ -25,10 +25,10 @@
 Summary: Ganglia Add-ons for HDP Monitoring Dashboard
 Name: hdp_mon_ganglia_addons
 Version: 0.0.1
-URL: http://hortonworks.com
+URL: http://incubator.apache.org/projects/ambari.html
 Release: 2
 License: Apache License, Version 2.0
-Vendor: Hortonworks <am...@hortonworks.com>
+Vendor: Apache Software Foundation (ambari-dev@incubator.apache.org)
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -65,5 +65,5 @@ for a better monitoring integration with
 %__rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Feb 17 2011 Hortonworks <am...@hortonworks.com>
+* Thu Jun 07 2011 Ambari <am...@incubator.apache.org>
 - Initial version

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/package/rpm/hdp_mon_nagios_addons.spec Thu Jun  7 23:26:41 2012
@@ -25,10 +25,10 @@
 Summary: Nagios Add-ons for HDP Monitoring Dashboard
 Name: hdp_mon_nagios_addons
 Version: 0.0.1
-URL: http://hortonworks.com
+URL: http://incubator.apache.org/projects/ambari.html
 Release: 2
 License: Apache License, Version 2.0
-Vendor: Hortonworks <am...@hortonworks.com>
+Vendor: Apache Software Foundation (ambari-dev@incubator.apache.org)
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -68,5 +68,5 @@ echo "Alias /hdp %{_prefix}/share/hdp" >
 %__rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Feb 17 2011 Hortonworks <am...@hortonworks.com>
+* Thu Jun 07 2012 Ambari <am...@incubator.apache.org>
 - Initial version

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/addOns/nagios/plugins/check_oozie_status.sh Thu Jun  7 23:26:41 2012
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 # OOZIE_URL is of the form http://<hostname>:<port>/oozie
-# OOZIE_URL: http://hortonworks-sandbox.localdomain:11000/oozie
 HOST=$1
 PORT=$2
 JAVA_HOME=$3

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hbase.html Thu Jun  7 23:26:41 2012
@@ -54,8 +54,8 @@
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
+			<a class="roundedBox" href="" target="_blank">Post Feedback</a>
+			<a class="roundedBox" href="" target="_blank">Documentation</a>
 			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
 			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
                         <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/hdfs.html Thu Jun  7 23:26:41 2012
@@ -54,8 +54,8 @@
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
+			<a class="roundedBox" href="" target="_blank">Post Feedback</a>
+			<a class="roundedBox" href="" target="_blank">Documentation</a>
 			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
 			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
                         <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/home.html Thu Jun  7 23:26:41 2012
@@ -53,8 +53,8 @@
     </nav>
     
     <section id="links">
-      <a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
-      <a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
+      <a class="roundedBox" href="" target="_blank">Post Feedback</a>
+      <a class="roundedBox" href="" target="_blank">Documentation</a>
       <a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
       <a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
       <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/js/common.js Thu Jun  7 23:26:41 2012
@@ -32,9 +32,9 @@
   
   // on document ready
   $(document).ready(function(){
-    document.title = 'Hortonworks Management Center';
-    $('#brand').html('Hortonworks Management Center');
-    $('#footer').html('Hortonworks &copy 2012');
+    document.title = 'Ambari';
+    $('#brand').html('Ambari');
+    $('#footer').html('');
     self.clearTimeout(to);
     a.refreshPage();
     a.setEventDelegation();
@@ -820,9 +820,9 @@
 
           // Refresh the caption to indicate service name.
           if(page == "HDFS" || page == "MAPREDUCE" || page == "HBASE"){
-            $("#alertsGrid").jqGrid('setCaption',"Configured Alerts (<a href=\"http://hortonworks.com\" target=\"_blank\">troubleshoot?</a>)");
+            $("#alertsGrid").jqGrid('setCaption',"Configured Alerts (<a href=\"\" target=\"\"></a>)");
           } else {
-            $("#alertsGrid").jqGrid('setCaption',targetId+" Alerts (<a href=\"http://hortonworks.com\" target=\"_blank\">troubleshoot?</a>)");
+            $("#alertsGrid").jqGrid('setCaption',targetId+" Alerts (<a href=\"\" target=\"\"></a>)");
           }
           
           // Populate Alerts Grid

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/src/ui/mapreduce.html Thu Jun  7 23:26:41 2012
@@ -54,8 +54,8 @@
 		</nav>
 		
 		<section id="links">
-			<a class="roundedBox" href="http://hortonworks.com/community/forums/" target="_blank">Post Feedback</a>
-			<a class="roundedBox" href="http://docs.hortonworks.com" target="_blank">Documentation</a>
+			<a class="roundedBox" href="" target="_blank">Post Feedback</a>
+			<a class="roundedBox" href="" target="_blank">Documentation</a>
 			<a id="nagios" class="roundedBox" href="" target="_blank">Nagios</a>
 			<a id="ganglia" class="roundedBox" href="" target="_blank">Ganglia</a>
                         <a id="oozie" class="hiddenLink" href="" target="_blank">Oozie</a>

Modified: incubator/ambari/branches/ambari-186/mon_dashboard/test/dataServices/jmx/data/sample_hbasemaster_jmx.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/mon_dashboard/test/dataServices/jmx/data/sample_hbasemaster_jmx.json?rev=1347830&r1=1347829&r2=1347830&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/mon_dashboard/test/dataServices/jmx/data/sample_hbasemaster_jmx.json (original)
+++ incubator/ambari/branches/ambari-186/mon_dashboard/test/dataServices/jmx/data/sample_hbasemaster_jmx.json Thu Jun  7 23:26:41 2012
@@ -826,7 +826,7 @@
     "name" : "hadoop:service=HBase,name=Info",
     "modelerType" : "org.apache.hadoop.hbase.metrics.HBaseInfo$HBaseInfoMBean",
     "revision" : "a23f8636efd6dd9d37f3a15d83f2396819509502",
-    "hdfsUser" : "hortonfo",
+    "hdfsUser" : "foo",
     "hdfsDate" : "Fri Dec 16 20:01:27 UTC 2011",
     "hdfsUrl" : "https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.0",
     "date" : "Tue Feb 14 10:12:33 PST 2012",