incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
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 GMT
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



Mime
View raw message