ambari git commit: AMBARI-10445. Populate cluster widgets from stack-defined widgets on cluster/service create. Upgrade Catalog changes. (swagle)

2015-04-10 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk d3d73f762 - 5dad81c3d


AMBARI-10445. Populate cluster widgets from stack-defined widgets on 
cluster/service create. Upgrade Catalog changes. (swagle)


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

Branch: refs/heads/trunk
Commit: 5dad81c3df577bc81f588cb61eae6b0f56089b87
Parents: d3d73f7
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Fri Apr 10 17:24:25 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Fri Apr 10 17:24:32 2015 -0700

--
 .../org/apache/ambari/server/upgrade/UpgradeCatalog210.java  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5dad81c3/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index e94d5f4..d72c9d3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -309,10 +309,10 @@ public class UpgradeCatalog210 extends 
AbstractUpgradeCatalog {
 columns.add(new DBColumnInfo(time_created, Long.class,  255,   null, 
false));
 columns.add(new DBColumnInfo(author, String.class,  255,   null, true));
 columns.add(new DBColumnInfo(description, String.class,  255,   null, 
true));
-columns.add(new DBColumnInfo(display_name, String.class,  255,   null, 
false));
+columns.add(new DBColumnInfo(display_name, String.class,  255,   null, 
true));
 columns.add(new DBColumnInfo(scope, String.class,  255,   null, true));
-columns.add(new DBColumnInfo(widget_values, String.class,  255,   null, 
true));
-columns.add(new DBColumnInfo(properties, String.class,  255,   null, 
true));
+columns.add(new DBColumnInfo(widget_values, String.class,  4000,   null, 
true));
+columns.add(new DBColumnInfo(properties, String.class,  4000,   null, 
true));
 columns.add(new DBColumnInfo(cluster_id, Long.class,  255,   null, 
false));
 dbAccessor.createTable(WIDGET_TABLE, columns, id);
 
@@ -323,7 +323,7 @@ public class UpgradeCatalog210 extends 
AbstractUpgradeCatalog {
 columns.add(new DBColumnInfo(cluster_id, Long.class,  255,   null, 
false));
 columns.add(new DBColumnInfo(scope, String.class,  255,   null, false));
 columns.add(new DBColumnInfo(user_name, String.class,  255,   null, 
false));
-columns.add(new DBColumnInfo(display_name, String.class,  255,   null, 
false));
+columns.add(new DBColumnInfo(display_name, String.class,  255,   null, 
true));
 
 dbAccessor.createTable(WIDGET_LAYOUT_TABLE, columns, id);

ambari git commit: AMBARI-10445. Populate cluster widgets from stack-defined widgets on cluster/service create. Upgrade Catalog changes. (swagle)

2015-04-10 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk f8b83e2f6 - 37717dd4c


AMBARI-10445. Populate cluster widgets from stack-defined widgets on 
cluster/service create. Upgrade Catalog changes. (swagle)


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

Branch: refs/heads/trunk
Commit: 37717dd4cd55ee75f3f218e6fee20af529cc0f87
Parents: f8b83e2
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Fri Apr 10 18:46:44 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Fri Apr 10 18:49:57 2015 -0700

--
 .../server/upgrade/UpgradeCatalog210.java   | 36 +
 .../server/upgrade/UpgradeCatalog210Test.java   | 78 
 2 files changed, 114 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/37717dd4/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index d72c9d3..09a8740 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -22,10 +22,18 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
+import org.apache.ambari.server.orm.dao.ClusterDAO;
+import org.apache.ambari.server.orm.dao.ClusterServiceDAO;
+import org.apache.ambari.server.orm.entities.ClusterEntity;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Service;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -357,6 +365,32 @@ public class UpgradeCatalog210 extends 
AbstractUpgradeCatalog {
 false);
   }
 
+  /**
+   * Copy cluster  service widgets from stack to DB.
+   */
+  protected void initializeClusterAndServiceWidgets() throws AmbariException {
+AmbariManagementController controller = 
injector.getInstance(AmbariManagementController.class);
+Clusters clusters = controller.getClusters();
+if (clusters == null) {
+  return;
+}
+
+MapString, Cluster clusterMap = clusters.getClusters();
+
+if (clusterMap != null  !clusterMap.isEmpty()) {
+  for (Cluster cluster : clusterMap.values()) {
+controller.initializeWidgetsAndLayouts(cluster, null);
+
+MapString, Service serviceMap = cluster.getServices();
+if (serviceMap != null  !serviceMap.isEmpty()) {
+  for (Service service : serviceMap.values()) {
+controller.initializeWidgetsAndLayouts(cluster, service);
+  }
+}
+  }
+}
+  }
+
   // - UpgradeCatalog 
 
   /**
@@ -425,5 +459,7 @@ public class UpgradeCatalog210 extends 
AbstractUpgradeCatalog {
   @Override
   protected void executeDMLUpdates() throws AmbariException, SQLException {
 addNewConfigurationsFromXml();
+// Initialize all default widgets and widget layouts
+initializeClusterAndServiceWidgets();
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/37717dd4/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
index af9dcda..6ca7dfd 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
@@ -18,19 +18,29 @@
 
 package org.apache.ambari.server.upgrade;
 
+import com.google.inject.AbstractModule;
 import com.google.inject.Binder;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.persist.PersistService;
+import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;