git commit: AMBARI-7738. Fix blueprint processor to properly handle config topology update for components with a valid cardinality of 0

2014-10-23 Thread jspeidel 
Repository: ambari
Updated Branches:
  refs/heads/trunk 27a9d78c9 - c19b78966


AMBARI-7738.  Fix blueprint processor to properly handle config topology update 
for components with a valid cardinality of 0


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

Branch: refs/heads/trunk
Commit: c19b7896667bbeedf83525b7b7c7e62e31a96b57
Parents: 27a9d78
Author: Robert Nettleton rnettle...@hortonworks.com
Authored: Thu Oct 23 14:44:55 2014 -0400
Committer: John Speidel jspei...@hortonworks.com
Committed: Thu Oct 23 14:45:51 2014 -0400

--
 .../internal/BaseBlueprintProcessor.java| 487 ---
 .../BlueprintConfigurationProcessor.java|  89 ++--
 .../server/controller/internal/Cardinality.java |  86 
 .../internal/ClusterResourceProvider.java   |   4 +-
 .../server/controller/internal/Stack.java   | 450 +
 .../internal/BaseBlueprintProcessorTest.java|  24 +-
 .../BlueprintConfigurationProcessorTest.java| 211 +++-
 .../internal/ClusterResourceProviderTest.java   |  24 +-
 8 files changed, 812 insertions(+), 563 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c19b7896/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
index abd22a4..9be73cc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
@@ -24,13 +24,6 @@ import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.StackAccessException;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.controller.AmbariManagementController;
-import org.apache.ambari.server.controller.StackConfigurationRequest;
-import org.apache.ambari.server.controller.StackConfigurationResponse;
-import org.apache.ambari.server.controller.StackLevelConfigurationRequest;
-import org.apache.ambari.server.controller.StackServiceComponentRequest;
-import org.apache.ambari.server.controller.StackServiceComponentResponse;
-import org.apache.ambari.server.controller.StackServiceRequest;
-import org.apache.ambari.server.controller.StackServiceResponse;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.orm.dao.BlueprintDAO;
@@ -42,10 +35,8 @@ import org.apache.ambari.server.orm.entities.HostGroupEntity;
 import org.apache.ambari.server.state.AutoDeployInfo;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.DependencyInfo;
-import org.apache.ambari.server.state.PropertyInfo;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -455,418 +446,6 @@ public abstract class BaseBlueprintProcessor extends 
AbstractControllerResourceP
   // - Inner Classes -
 
   /**
-   * Encapsulates stack information.
-   */
-  protected static class Stack {
-/**
- * Stack name
- */
-private String name;
-
-/**
- * Stack version
- */
-private String version;
-
-/**
- * Map of service name to components
- */
-private MapString, CollectionString serviceComponents =
-new HashMapString, CollectionString();
-
-/**
- * Map of component to service
- */
-private MapString, String componentService = new HashMapString, 
String();
-
-/**
- * Map of component to dependencies
- */
-private MapString, CollectionDependencyInfo dependencies =
-new HashMapString, CollectionDependencyInfo();
-
-/**
- * Map of dependency to conditional service
- */
-private MapDependencyInfo, String dependencyConditionalServiceMap =
-new HashMapDependencyInfo, String();
-
-/**
- * Map of database component name to configuration property which 
indicates whether
- * the database in to be managed or if it is an external non-managed 
instance.
- * If the value of the config property starts with 'New', the database is 
determined
- * to be managed, otherwise it is non-managed.
- */
-private MapString, String dbDependencyInfo = new

git commit: AMBARI-7738. Fix blueprint processor to properly handle config topology update for components with a valid cardinality of 0

2014-10-23 Thread jspeidel 
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 1cc2d64e5 - a736a0cfa


AMBARI-7738.  Fix blueprint processor to properly handle config topology update 
for components with a valid cardinality of 0


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

Branch: refs/heads/branch-1.7.0
Commit: a736a0cfa5c6add7c2223560ac8bd14d42003c88
Parents: 1cc2d64
Author: Robert Nettleton rnettle...@hortonworks.com
Authored: Thu Oct 23 14:44:55 2014 -0400
Committer: John Speidel jspei...@hortonworks.com
Committed: Thu Oct 23 14:47:00 2014 -0400

--
 .../internal/BaseBlueprintProcessor.java| 487 ---
 .../BlueprintConfigurationProcessor.java|  89 ++--
 .../server/controller/internal/Cardinality.java |  86 
 .../internal/ClusterResourceProvider.java   |   4 +-
 .../server/controller/internal/Stack.java   | 450 +
 .../internal/BaseBlueprintProcessorTest.java|  24 +-
 .../BlueprintConfigurationProcessorTest.java| 211 +++-
 .../internal/ClusterResourceProviderTest.java   |  24 +-
 8 files changed, 812 insertions(+), 563 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a736a0cf/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
index abd22a4..9be73cc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseBlueprintProcessor.java
@@ -24,13 +24,6 @@ import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.StackAccessException;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.controller.AmbariManagementController;
-import org.apache.ambari.server.controller.StackConfigurationRequest;
-import org.apache.ambari.server.controller.StackConfigurationResponse;
-import org.apache.ambari.server.controller.StackLevelConfigurationRequest;
-import org.apache.ambari.server.controller.StackServiceComponentRequest;
-import org.apache.ambari.server.controller.StackServiceComponentResponse;
-import org.apache.ambari.server.controller.StackServiceRequest;
-import org.apache.ambari.server.controller.StackServiceResponse;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.orm.dao.BlueprintDAO;
@@ -42,10 +35,8 @@ import org.apache.ambari.server.orm.entities.HostGroupEntity;
 import org.apache.ambari.server.state.AutoDeployInfo;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.DependencyInfo;
-import org.apache.ambari.server.state.PropertyInfo;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -455,418 +446,6 @@ public abstract class BaseBlueprintProcessor extends 
AbstractControllerResourceP
   // - Inner Classes -
 
   /**
-   * Encapsulates stack information.
-   */
-  protected static class Stack {
-/**
- * Stack name
- */
-private String name;
-
-/**
- * Stack version
- */
-private String version;
-
-/**
- * Map of service name to components
- */
-private MapString, CollectionString serviceComponents =
-new HashMapString, CollectionString();
-
-/**
- * Map of component to service
- */
-private MapString, String componentService = new HashMapString, 
String();
-
-/**
- * Map of component to dependencies
- */
-private MapString, CollectionDependencyInfo dependencies =
-new HashMapString, CollectionDependencyInfo();
-
-/**
- * Map of dependency to conditional service
- */
-private MapDependencyInfo, String dependencyConditionalServiceMap =
-new HashMapDependencyInfo, String();
-
-/**
- * Map of database component name to configuration property which 
indicates whether
- * the database in to be managed or if it is an external non-managed 
instance.
- * If the value of the config property starts with 'New', the database is 
determined
- * to be managed, otherwise it is non-managed.
- */
-private MapString, String