[23/34] ambari git commit: AMBARI-20616: Provide an optional attribute for custom commands to specify title used in operations window title (sangeetar)

2017-04-26 Thread jonathanhurley
AMBARI-20616: Provide an optional attribute for custom commands to specify 
title used in operations window title (sangeetar)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/35d7220a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/35d7220a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/35d7220a

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 35d7220afb894565134dd1503d8f2dc08d7be59c
Parents: ec51e16
Author: Sangeeta Ravindran 
Authored: Tue Apr 25 12:19:03 2017 -0700
Committer: Sangeeta Ravindran 
Committed: Tue Apr 25 12:58:22 2017 -0700

--
 .../server/actionmanager/HostRoleCommand.java   | 10 
 .../AmbariCustomCommandExecutionHelper.java |  3 ++
 .../internal/TaskResourceProvider.java  |  3 ++
 .../orm/entities/HostRoleCommandEntity.java | 15 ++
 .../server/state/CustomCommandDefinition.java   |  5 ++
 .../server/upgrade/UpgradeCatalog300.java   | 15 ++
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 +
 .../src/main/resources/properties.json  |  1 +
 .../internal/TaskResourceProviderTest.java  |  8 
 .../orm/entities/HostRoleCommandEntityTest.java | 49 
 .../server/upgrade/UpgradeCatalog300Test.java   |  8 
 .../app/controllers/wizard/step9_controller.js  |  2 +-
 ambari-web/app/utils/ajax/ajax.js   |  8 ++--
 ambari-web/app/utils/helper.js  |  7 ++-
 ambari-web/app/utils/host_progress_popup.js |  2 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |  2 +-
 ambari-web/test/utils/helper_test.js|  5 ++
 22 files changed, 141 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/35d7220a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
index 87a6edf..bd354d9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
@@ -69,6 +69,7 @@ public class HostRoleCommand {
   private String customCommandName;
   private ExecutionCommandWrapper executionCommandWrapper;
   private boolean isBackgroundCommand = false;
+  private String opsDisplayName;
 
   @Inject
   private ExecutionCommandDAO executionCommandDAO;
@@ -179,6 +180,7 @@ public class HostRoleCommand {
 roleCommand = hostRoleCommandEntity.getRoleCommand();
 event = new 
ServiceComponentHostEventWrapper(hostRoleCommandEntity.getEvent());
 commandDetail = hostRoleCommandEntity.getCommandDetail();
+opsDisplayName = hostRoleCommandEntity.getOpsDisplayName();
 customCommandName = hostRoleCommandEntity.getCustomCommandName();
 isBackgroundCommand = hostRoleCommandEntity.isBackgroundCommand();
   }
@@ -202,6 +204,7 @@ public class HostRoleCommand {
 hostRoleCommandEntity.setAutoSkipOnFailure(autoSkipFailure);
 hostRoleCommandEntity.setRoleCommand(roleCommand);
 hostRoleCommandEntity.setCommandDetail(commandDetail);
+hostRoleCommandEntity.setOpsDisplayName(opsDisplayName);
 hostRoleCommandEntity.setCustomCommandName(customCommandName);
 hostRoleCommandEntity.setBackgroundCommand(isBackgroundCommand);
 
@@ -294,6 +297,13 @@ public class HostRoleCommand {
 this.commandDetail = commandDetail;
   }
 
+  public String getOpsDisplayName() {
+return opsDisplayName;
+  }
+
+  public void setOpsDisplayName(String opsDisplayName) {
+this.opsDisplayName = opsDisplayName;
+  }
   public String getCustomCommandName() {
 return customCommandName;
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/35d7220a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 17bc718..ab8b659 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ 

ambari git commit: AMBARI-20616: Provide an optional attribute for custom commands to specify title used in operations window title (sangeetar)

2017-04-25 Thread sangeetar
Repository: ambari
Updated Branches:
  refs/heads/trunk ec51e1663 -> 35d7220af


AMBARI-20616: Provide an optional attribute for custom commands to specify 
title used in operations window title (sangeetar)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/35d7220a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/35d7220a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/35d7220a

Branch: refs/heads/trunk
Commit: 35d7220afb894565134dd1503d8f2dc08d7be59c
Parents: ec51e16
Author: Sangeeta Ravindran 
Authored: Tue Apr 25 12:19:03 2017 -0700
Committer: Sangeeta Ravindran 
Committed: Tue Apr 25 12:58:22 2017 -0700

--
 .../server/actionmanager/HostRoleCommand.java   | 10 
 .../AmbariCustomCommandExecutionHelper.java |  3 ++
 .../internal/TaskResourceProvider.java  |  3 ++
 .../orm/entities/HostRoleCommandEntity.java | 15 ++
 .../server/state/CustomCommandDefinition.java   |  5 ++
 .../server/upgrade/UpgradeCatalog300.java   | 15 ++
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 +
 .../src/main/resources/properties.json  |  1 +
 .../internal/TaskResourceProviderTest.java  |  8 
 .../orm/entities/HostRoleCommandEntityTest.java | 49 
 .../server/upgrade/UpgradeCatalog300Test.java   |  8 
 .../app/controllers/wizard/step9_controller.js  |  2 +-
 ambari-web/app/utils/ajax/ajax.js   |  8 ++--
 ambari-web/app/utils/helper.js  |  7 ++-
 ambari-web/app/utils/host_progress_popup.js |  2 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |  2 +-
 ambari-web/test/utils/helper_test.js|  5 ++
 22 files changed, 141 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/35d7220a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
index 87a6edf..bd354d9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
@@ -69,6 +69,7 @@ public class HostRoleCommand {
   private String customCommandName;
   private ExecutionCommandWrapper executionCommandWrapper;
   private boolean isBackgroundCommand = false;
+  private String opsDisplayName;
 
   @Inject
   private ExecutionCommandDAO executionCommandDAO;
@@ -179,6 +180,7 @@ public class HostRoleCommand {
 roleCommand = hostRoleCommandEntity.getRoleCommand();
 event = new 
ServiceComponentHostEventWrapper(hostRoleCommandEntity.getEvent());
 commandDetail = hostRoleCommandEntity.getCommandDetail();
+opsDisplayName = hostRoleCommandEntity.getOpsDisplayName();
 customCommandName = hostRoleCommandEntity.getCustomCommandName();
 isBackgroundCommand = hostRoleCommandEntity.isBackgroundCommand();
   }
@@ -202,6 +204,7 @@ public class HostRoleCommand {
 hostRoleCommandEntity.setAutoSkipOnFailure(autoSkipFailure);
 hostRoleCommandEntity.setRoleCommand(roleCommand);
 hostRoleCommandEntity.setCommandDetail(commandDetail);
+hostRoleCommandEntity.setOpsDisplayName(opsDisplayName);
 hostRoleCommandEntity.setCustomCommandName(customCommandName);
 hostRoleCommandEntity.setBackgroundCommand(isBackgroundCommand);
 
@@ -294,6 +297,13 @@ public class HostRoleCommand {
 this.commandDetail = commandDetail;
   }
 
+  public String getOpsDisplayName() {
+return opsDisplayName;
+  }
+
+  public void setOpsDisplayName(String opsDisplayName) {
+this.opsDisplayName = opsDisplayName;
+  }
   public String getCustomCommandName() {
 return customCommandName;
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/35d7220a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 17bc718..ab8b659 100644
---