Return-Path: 
 <ambari-commits-return-443-apmail-incubator-ambari-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A8BF5C73A
	for <apmail-incubator-ambari-commits-archive@minotaur.apache.org>;
 Fri, 18 May 2012 06:05:52 +0000 (UTC)
Received: (qmail 51297 invoked by uid 500); 18 May 2012 06:05:52 -0000
Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org
Received: (qmail 51269 invoked by uid 500); 18 May 2012 06:05:51 -0000
Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ambari-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ambari-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ambari-commits@incubator.apache.org>
List-Id: <ambari-commits.incubator.apache.org>
Reply-To: ambari-dev@incubator.apache.org
Delivered-To: mailing list ambari-commits@incubator.apache.org
Received: (qmail 51250 invoked by uid 99); 18 May 2012 06:05:51 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2012 06:05:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2012 06:05:49 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8DFCE2388978;
	Fri, 18 May 2012 06:05:29 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1339987 - in /incubator/ambari/branches/ambari-186:
 CHANGES.txt
 hmc/html/initializeCluster.php hmc/js/all.out hmc/js/utils.js
 hmc/php/frontend/initDB.php hmc/php/frontend/uninstall/uninstallUtil.php
 hmc/php/util/initDB.php
Date: Fri, 18 May 2012 06:05:29 -0000
To: ambari-commits@incubator.apache.org
From: hitesh@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120518060529.8DFCE2388978@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hitesh
Date: Fri May 18 06:05:28 2012
New Revision: 1339987

URL: http://svn.apache.org/viewvc?rev=1339987&view=rev
Log:
AMBARI-280. Cleanup of utilities. Contributed by Vikram

Added:
    incubator/ambari/branches/ambari-186/hmc/php/util/initDB.php   (with props)
Removed:
    incubator/ambari/branches/ambari-186/hmc/js/all.out
    incubator/ambari/branches/ambari-186/hmc/php/frontend/initDB.php
Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php
    incubator/ambari/branches/ambari-186/hmc/js/utils.js
    incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/uninstallUtil.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1339987&r1=1339986&r2=1339987&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri May 18 06:05:28 2012
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI 280. Cleanup of utilities. (Vikram via hitesh)
+
   AMBARI-249. Uninstall support from UI. (Vikram via hitesh)
 
   AMBARI-277. API for getting cluster status. (Vikram via hitesh)

Modified: incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php?rev=1339987&r1=1339986&r2=1339987&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php Fri May 18 06:05:28 2012
@@ -84,7 +84,6 @@
             </li>
           </ol>
         </div>
-        
 
         <?php require "./utils.htmli"; ?>
 
@@ -296,6 +295,7 @@
             <script type="text/javascript">
 
             var freshInstall = true;
+            var nodesAction = "addNodes";
 
             var InstallationWizard = {
 

Modified: incubator/ambari/branches/ambari-186/hmc/js/utils.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/utils.js?rev=1339987&r1=1339986&r2=1339987&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/utils.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/utils.js Fri May 18 06:05:28 2012
@@ -217,6 +217,9 @@ function convertDisplayType (displayType
 
     case "SECRET":
       return "password";
+
+    case "ONOFF":
+      return "checkbox";
     
     default:
       return "text";

Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/uninstallUtil.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/uninstallUtil.php?rev=1339987&r1=1339986&r2=1339987&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/uninstallUtil.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/uninstallUtil.php Fri May 18 06:05:28 2012
@@ -21,8 +21,7 @@ function handleUninstallTransaction ($cl
     return;
   }
 
-  $hosts = explode(",", $hostsStr);
-  runPdsh($clusterName, $operationName, $deployUser, $hosts, $cmdLine);
+  runPdsh($clusterName, $operationName, $deployUser, $hostsStr, $cmdLine);
 
   $retArr = parseAndUpdateNodeInfo($clusterName, $operationName, $logger);
 

Added: incubator/ambari/branches/ambari-186/hmc/php/util/initDB.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/util/initDB.php?rev=1339987&view=auto
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/util/initDB.php (added)
+++ incubator/ambari/branches/ambari-186/hmc/php/util/initDB.php Fri May 18 06:05:28 2012
@@ -0,0 +1,11 @@
+<?php
+include_once '../util/Logger.php';
+include_once "../conf/Config.inc";
+
+print "database is " . $GLOBALS["DB_PATH"] . "\n";
+$db = new PDO("sqlite:" . $GLOBALS["DB_PATH"]);
+$sql = file_get_contents(realpath( $GLOBALS["DB_PATH"] );
+
+$db->exec($sql) or die(print_r($db->errorInfo(), true));
+
+?>

Propchange: incubator/ambari/branches/ambari-186/hmc/php/util/initDB.php
------------------------------------------------------------------------------
    svn:eol-style = native