AMBARI-497. Messaging clean up (Contributed by Yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1347333 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-497. Messaging clean up (Yusaku via Vikram)
+
   AMBARI-496. Ganglia graphs have labels/content that are not meaningful (Suhas via Vikram)
 
   AMBARI-494. Fix node assignments not not allow slaves on master. (Mahadev via Vikram)

hmc/html/addNodesWizard.php

@@ -57,11 +57,7 @@
  
               <fieldset>
                 <form id="addNodesFilesFormId" enctype="multipart/form-data" method="post">
-                  <p>
-                  <label for="clusterDeployUserId"><?php echo $RES['common.sshUsername.label'] ?></label>
-                  <input type="text" name="ClusterDeployUser" id="clusterDeployUserId" value="root" placeholder="">
-                  </p>
-                  <br/>
+                  <input type="hidden" name="ClusterDeployUser" id="clusterDeployUserId" value="root" placeholder="">
                   <p>
                   <label for="clusterDeployUserIdentityFileId"><?php echo $RES['common.sshPrivateKeyFile.label'] ?></label>
                   <input type="file" name="clusterDeployUserIdentityFile" id="clusterDeployUserIdentityFileId" value="" placeholder="">

hmc/html/initializeCluster.php

@@ -114,9 +114,7 @@
                   </div>                  
                   <div class="pageContent">
                   <form id="addNodesFilesFormId" enctype="multipart/form-data" method="post">
-                    <label for="clusterDeployUserId"><?php echo $RES['common.sshUsername.label'] ?></label>
-                    <input type="text" name="ClusterDeployUser" id="clusterDeployUserId" value="root" placeholder="">
-                    <div class="separator"></div>
+                    <input type="hidden" name="ClusterDeployUser" id="clusterDeployUserId" value="root" placeholder="">
                     <label for="clusterDeployUserIdentityFileId"><?php echo $RES['common.sshPrivateKeyFile.label'] ?></label>
                     <input type="file" name="clusterDeployUserIdentityFile" id="clusterDeployUserIdentityFileId" value="" placeholder="">
                     <div class="separator"></div>
@@ -323,7 +321,7 @@
                 'js/configureServicesUtils.js',
                 'js/configureServices.js',
                 'js/reviewAndDeploy.js',
-                'js/deployProgress.js'                  
+                'js/deployProgress.js'     
               ];
             </script>
 

hmc/html/uninstallWizard.php

@@ -35,29 +35,28 @@
         <div id="installationMainFormsDivId">    
           <div id="formStatusDivId" class="alert alert-error" style="display:none">					
           </div>        
-          <div id="addNodesCoreDivId" style="display:block">
-            <fieldset>
-              <form id="addNodesFilesFormId" enctype="multipart/form-data" method="post">
-              <label for="clusterDeployUserId"><?php echo $RES['common.sshUsername.label'] ?></label>
-              <input type="text" name="ClusterDeployUser" id="clusterDeployUserId" value="root" placeholder="">      
-              <div class="separator"></div>
-              <label for="clusterDeployUserIdentityFileId"><?php echo $RES['common.sshPrivateKeyFile.label'] ?></label>
-              <input type="file" name="clusterDeployUserIdentityFile" id="clusterDeployUserIdentityFileId" value="" placeholder="">
-              <div class="separator"></div>
-              <div id="fileUploadWrapperDivId">
-                <iframe name="fileUploadTarget" id="fileUploadTargetId" src="about:blank" style="display:none"></iframe>
-              </div>              
-              <div class="separator"></div>
-              <div id="confirmWipeOutDivId">
-                <label class="checkbox" for="confirmWipeOutId"><?php echo $RES['uninstallWizard.wipeout.label'] ?>
-                  <input type="checkbox" id="confirmWipeOutCheckId" value="false">
-                </label>
-              </div>
-              <div class="separator"></div>
-              <input type="button" class="btn btn-large" id="addNodesSubmitButtonId" value="<?php echo $RES['uninstallWizard.submit.label'] ?>">
-            </fieldset>
+          <div class="pageContent">
+            <div id="addNodesCoreDivId" style="display:block">
+              <fieldset>
+                <form id="addNodesFilesFormId" enctype="multipart/form-data" method="post">
+                <input type="hidden" name="ClusterDeployUser" id="clusterDeployUserId" value="root" placeholder="">
+                <label for="clusterDeployUserIdentityFileId"><?php echo $RES['common.sshPrivateKeyFile.label'] ?></label>
+                <input type="file" name="clusterDeployUserIdentityFile" id="clusterDeployUserIdentityFileId" value="" placeholder="">
+                <div class="separator"></div>
+                <div id="fileUploadWrapperDivId">
+                  <iframe name="fileUploadTarget" id="fileUploadTargetId" src="about:blank" style="display:none"></iframe>
+                </div>              
+                <div class="separator"></div>
+                <div id="confirmWipeOutDivId">
+                  <label class="checkbox" for="confirmWipeOutId"><?php echo $RES['uninstallWizard.wipeout.label'] ?>
+                    <input type="checkbox" id="confirmWipeOutCheckId" value="false">
+                  </label>
+                </div>
+                <div class="separator"></div>
+                <input type="button" class="btn btn-large" id="addNodesSubmitButtonId" value="<?php echo $RES['uninstallWizard.submit.label'] ?>">
+              </fieldset>
+            </div>
           </div>
-
           <?php require "./txnUtils.htmli"; ?>
 
         </div>

hmc/js/deployProgress.js

@@ -160,7 +160,7 @@ function renderDeployProgress (deployProgressInfo) {
   };
 
   var deployProgressWidget = new TxnProgressWidget
-    ( deployProgressInfo, 'Cluster Deploy', deployProgressStatusMessage, deployProgressPostCompletionFixup );
+    ( deployProgressInfo, 'Deployment Progress', deployProgressStatusMessage, deployProgressPostCompletionFixup );
   
   deployProgressWidget.show();
 } 

hmc/js/manageServices.js

@@ -569,6 +569,7 @@ var fetchClusterServicesPollerResponseHandler = {
     var serviceManagementMarkup = '';
 
     // Separate block for client-only software
+    /*
     var clientOnlySoftwareMarkup = '';
     for (var serviceName in clusterServices) {
       var serviceInfo = clusterServices[serviceName];
@@ -581,9 +582,10 @@ var fetchClusterServicesPollerResponseHandler = {
       serviceManagementMarkup += clientOnlySoftwareMarkup;
       serviceManagementMarkup += '</div>';
     }
+    */
 
     // Real services with server side components
-    serviceManagementMarkup += '<div class="serviceManagementGroup"><h2>Long-running services</h2><ul>';
+    serviceManagementMarkup += '<div class="serviceManagementGroup" style="margin-top:30px"><ul>';
     for (var serviceName in clusterServices) {
       var serviceInfo = clusterServices[serviceName];
       if (clusterServices.hasOwnProperty(serviceName) && serviceInfo.attributes.runnable) {

hmc/php/conf/MessageResources-en.inc

@@ -3,9 +3,9 @@ $RES['app.name']="Hortonworks Management Center";
 $RES['page.title']="Hortonworks Management Center";
 $RES['page.footer.body']="Hortonworks © 2012";
 $RES['welcome.header']="Welcome to Hortonworks Management Center!";
-$RES['welcome.body']="<p>Hortonworks Management Center makes it really easy for you to install, configure, and manage your Hadoop cluster.</p><p>First, we'll walk you through setting up your cluster with a 7-step wizard.</p>";
-$RES['welcome.note']="Before you proceed, make sure you have performed all the pre-installation steps (REFERENCE MATERIAL HERE).";
-$RES['welcome.submit.label']="Let's get started!";
+$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['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";
 $RES['installFailed.body']="Cluster installation failed.  To continue, you will need to uninstall the cluster first and re-install the cluster.";
 $RES['installFailed.submit.label']="Start the uninstall process";
@@ -17,25 +17,25 @@ $RES['uninstallFailed.body']="Failed to uninstall the cluster.  (REFERENCE MATER
 $RES['common.sshUsername.label']="SSH Username";
 $RES['common.sshPrivateKeyFile.label']="SSH Private Key File";
 $RES['common.hostsFile.label']="Hosts File (newline-delimited list of hostnames)";
-$RES['initWizard.createCluster.pageSummary.header']="Let's create a new Hadoop cluster";
+$RES['initWizard.createCluster.pageSummary.header']="Name your Hadoop cluster";
 $RES['initWizard.createCluster.pageSummary.body']="";
 $RES['initWizard.createCluster.clusterName.label']="Name of your new cluster";
-$RES['initWizard.createCluster.submit.label']="Create Cluster";
+$RES['initWizard.createCluster.submit.label']="Next";
 $RES['initWizard.addNodes.pageSummary.header']="Which nodes do you want to install Hadoop on?";
-$RES['initWizard.addNodes.pageSummary.body']="We'll use the SSH private key and a file containing a list of hostnames to perform installation on your nodes.  The public key that is paired with the private key must already be installed on all the nodes.";
+$RES['initWizard.addNodes.pageSummary.body']="We will use the SSH private key for the <i>root</i> user and a file containing a list of hostnames to perform installation on your nodes.  The corresponding public key must already be in <i>authorized_keys</i> on all the nodes.";
 $RES['initWizard.addNodes.useLocalYum.label']="Use local yum mirror instead of downloading packages from the internet";
 $RES['initWizard.addNodes.yumRepoFilePath.label']="YUM Repo File Path";
 $RES['initWizard.addNodes.apacheArtifactsDownloadUrl.label']="Apache Artifacts Download URL";
 $RES['initWizard.addNodes.gplArtifactsDownloadUrl.label']="GPL Artifacts Download URL";
 $RES['initWizard.addNodes.submit.label']="Add Nodes";
 $RES['initWizard.selectServices.pageSummary.header']="Which services do you want to install?";
-$RES['initWizard.selectServices.pageSummary.body']="We'll automatically take care of dependencies (e.g., HBase requires ZooKeeper, etc.)";
+$RES['initWizard.selectServices.pageSummary.body']="We will automatically take care of dependencies (e.g., HBase requires ZooKeeper, etc.)";
 $RES['initWizard.selectServices.submit.label']="Select Services";
 $RES['initWizard.assignMasters.pageSummary.header']="Assign Master Services to Hosts";
 $RES['initWizard.assignMasters.pageSummary.body']="We have come up with recommendations on where the master services should be hosted.  Modify as you see fit.";
 $RES['initWizard.assignMasters.submit.label']="Next";
-$RES['initWizard.configureCluster.pageSummary.header']="Specify Mount Points";
-$RES['initWizard.configureCluster.pageSummary.body']="We found the following mount points on your nodes. Please confirm/modify the mount points to use for your nodes.";
+$RES['initWizard.configureCluster.pageSummary.header']="Specify Disk Mount Points";
+$RES['initWizard.configureCluster.pageSummary.body']="We found the following disk mount points on your nodes. Please confirm/modify the mount points to use for your nodes.";
 $RES['initWizard.configureCluster.customMountPoints.label']="Custom mount points";
 $RES['initWizard.configureCluster.preview.label']="Preview directories to be used";
 $RES['initWizard.configureCluster.submit.label']="Next";
@@ -43,10 +43,10 @@ $RES['initWizard.configureClusterAdvanced.pageSummary.header']="Customize Settin
 $RES['initWizard.configureClusterAdvanced.pageSummary.body']="We have come up with reasonable default settings.  Customize as you see fit.";
 $RES['initWizard.configureClusterAdvanced.submit.label']="Next";
 $RES['initWizard.reviewAndDeploy.pageSummary.header']="Review and Deploy";
-$RES['initWizard.reviewAndDeploy.pageSummary.body']="<p>We are ready to deploy!  Please review your settings below.</p><p>If you wish to make any changes, you can click on any of the installation stages above.  Note that if you do go back to a stage, you will have to go through all the subsequent stages again.</p>";
+$RES['initWizard.reviewAndDeploy.pageSummary.body']="<p>Please review your settings below.</p><p>If you wish to make any changes, you can click on any of the installation stages above.  Note that if you do go back to a stage, you will have to go through all the subsequent stages again.</p>";
 $RES['initWizard.reviewAndDeploy.submit.label']='Deploy';
 $RES['addNodesWizard.addNodes.pageSummary.header']="Which nodes are you adding to the cluster?";
-$RES['addNodesWizard.addNodes.pageSummary.body']="We'll use the SSH private key and a file containing a list of hostnames to perform installation on your nodes.  The public key that is paired with the private key must already be installed on all the nodes.";
+$RES['addNodesWizard.addNodes.pageSummary.body']="We will use the SSH private key for the <i>root</i> user and a file containing a list of hostnames to perform installation on your nodes.  The corresponding public key must already be in <i>authorized_keys</i> on all the nodes.";
 $RES['addNodesWizard.addNodes.submit.label']="Add Nodes";
 $RES['addNodesWizard.selectServices.pageSummary.header']='Install Services';
 $RES['addNodesWizard.selectServices.pageSummary.body']="Select the services that you wish to install on your nodes.  Note that some services are selected by default and cannot be deselected.";

hmc/php/orchestrator/Service.php

@@ -363,7 +363,7 @@ class Service {
     if ($dryRun) {
       $txnProgress = TransactionProgress::PENDING;
     }
-    $desc = getActionDescription($this->displayName, "smoke test",
+    $desc = getActionDescription($this->displayName, "test",
         TransactionProgress::$PROGRESS[$txnProgress]);
 
     $result =
@@ -385,7 +385,7 @@ class Service {
   }
 
   public function smoke($transaction, $dryRun) {
-    $this->currentAction = "smoke test";
+    $this->currentAction = "test";
 
     $this->checkIsClientOnly();
     if ($this->isClientOnly