[13/16] ambari git commit: AMBARI-22137 - Different stack versions should be able to link to different extension versions

2017-11-27 Thread aonishuk 
AMBARI-22137 - Different stack versions should be able to link to different 
extension versions


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

Branch: refs/heads/branch-feature-AMBARI-22457
Commit: d7b25eec2629822f90cac6de510f806b1004a8f7
Parents: 7c56924
Author: Tim Thorpe 
Authored: Tue Oct 10 13:54:01 2017 -0700
Committer: Tim Thorpe 
Committed: Fri Nov 24 12:13:01 2017 -0800

--
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../ambari/server/stack/ExtensionHelper.java|  57 ++-
 .../apache/ambari/server/stack/StackModule.java |   4 +
 .../server/stack/StackManagerExtensionTest.java |  31 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   2 +-
 .../stacks_with_extensions/HDP/0.4/metainfo.xml |  22 ++
 .../HDP/0.4/repos/repoinfo.xml  |  63 +++
 .../HDP/0.4/services/HBASE/metainfo.xml |  26 ++
 .../0.4/services/HDFS/configuration/global.xml  | 145 +++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 ++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++
 .../HDP/0.4/services/HDFS/metainfo.xml  |  30 ++
 .../0.4/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.4/services/HIVE/metainfo.xml  |  26 ++
 .../HDP/0.4/services/MAPREDUCE/metainfo.xml |  23 ++
 .../HDP/0.4/services/ZOOKEEPER/metainfo.xml |  26 ++
 19 files changed, 1425 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b25eec/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index 2dd6f12..0c8edfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
@@ -70,7 +70,7 @@ public class AmbariManagementHelper {
*/
   public void createExtensionLink(StackManager stackManager, StackInfo 
stackInfo, ExtensionInfo extensionInfo) throws AmbariException {
 validateCreateExtensionLinkRequest(stackInfo, extensionInfo);
-ExtensionHelper.validateCreateLink(stackInfo, extensionInfo);
+ExtensionHelper.validateCreateLink(stackManager, stackInfo, extensionInfo);
 ExtensionLinkEntity linkEntity = createExtensionLinkEntity(stackInfo, 
extensionInfo);
 stackManager.linkStackToExtension(stackInfo, extensionInfo);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b25eec/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index cd4d9f3..8e1d989 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
 import org.apache.ambari.server.utils.VersionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An extension version is like a stack version but it contains custom 
services.  Linking an extension
@@ -35,6 +37,8 @@ import org.apache.ambari.server.utils.VersionUtils;
  */
 public class ExtensionHelper {
 
+  private final static Logger LOG = 
LoggerFactory.getLogger(ExtensionHelper.class);
+
   public static void validateDeleteLink(Clusters clusters, StackInfo stack, 
ExtensionInfo extension) throws AmbariException {
 validateNotRequiredExtension(stack, extension);
 validateServicesNotInstalled(clusters, stack, extension);
@@ -62,9 +66,9 @@ public class ExtensionHelper {
 }
   }
 
-  public static void validateCreateLink(StackInfo stack, ExtensionInfo 
extension) throws AmbariException {
+  public static void validateCreateLink(StackManager stackManager, StackInfo 
stack, ExtensionInfo extension) throws AmbariException {

ambari git commit: AMBARI-22137 - Different stack versions should be able to link to different extension versions

2017-11-24 Thread tthorpe 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 7c56924a9 -> d7b25eec2


AMBARI-22137 - Different stack versions should be able to link to different 
extension versions


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

Branch: refs/heads/branch-2.6
Commit: d7b25eec2629822f90cac6de510f806b1004a8f7
Parents: 7c56924
Author: Tim Thorpe 
Authored: Tue Oct 10 13:54:01 2017 -0700
Committer: Tim Thorpe 
Committed: Fri Nov 24 12:13:01 2017 -0800

--
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../ambari/server/stack/ExtensionHelper.java|  57 ++-
 .../apache/ambari/server/stack/StackModule.java |   4 +
 .../server/stack/StackManagerExtensionTest.java |  31 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   2 +-
 .../stacks_with_extensions/HDP/0.4/metainfo.xml |  22 ++
 .../HDP/0.4/repos/repoinfo.xml  |  63 +++
 .../HDP/0.4/services/HBASE/metainfo.xml |  26 ++
 .../0.4/services/HDFS/configuration/global.xml  | 145 +++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 ++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++
 .../HDP/0.4/services/HDFS/metainfo.xml  |  30 ++
 .../0.4/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.4/services/HIVE/metainfo.xml  |  26 ++
 .../HDP/0.4/services/MAPREDUCE/metainfo.xml |  23 ++
 .../HDP/0.4/services/ZOOKEEPER/metainfo.xml |  26 ++
 19 files changed, 1425 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b25eec/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index 2dd6f12..0c8edfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
@@ -70,7 +70,7 @@ public class AmbariManagementHelper {
*/
   public void createExtensionLink(StackManager stackManager, StackInfo 
stackInfo, ExtensionInfo extensionInfo) throws AmbariException {
 validateCreateExtensionLinkRequest(stackInfo, extensionInfo);
-ExtensionHelper.validateCreateLink(stackInfo, extensionInfo);
+ExtensionHelper.validateCreateLink(stackManager, stackInfo, extensionInfo);
 ExtensionLinkEntity linkEntity = createExtensionLinkEntity(stackInfo, 
extensionInfo);
 stackManager.linkStackToExtension(stackInfo, extensionInfo);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b25eec/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index cd4d9f3..8e1d989 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
 import org.apache.ambari.server.utils.VersionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An extension version is like a stack version but it contains custom 
services.  Linking an extension
@@ -35,6 +37,8 @@ import org.apache.ambari.server.utils.VersionUtils;
  */
 public class ExtensionHelper {
 
+  private final static Logger LOG = 
LoggerFactory.getLogger(ExtensionHelper.class);
+
   public static void validateDeleteLink(Clusters clusters, StackInfo stack, 
ExtensionInfo extension) throws AmbariException {
 validateNotRequiredExtension(stack, extension);
 validateServicesNotInstalled(clusters, stack, extension);
@@ -62,9 +66,9 @@ public class ExtensionHelper {
 }
   }
 
-  public static void validateCreateLink(StackInfo stack, ExtensionInfo 
extension) throws AmbariException {
+  public static void validateCreateLink(StackManager stackManager, StackInfo 
stack,

[22/50] [abbrv] ambari git commit: AMBARI-22137 - Different stack versions should be able to link to different extension versions

2017-10-13 Thread rlevas 
AMBARI-22137 - Different stack versions should be able to link to different 
extension versions


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 03273bdce970a1282d89056aa48dc2ffe3b7b712
Parents: a3a8afc
Author: Tim Thorpe 
Authored: Tue Oct 10 13:54:01 2017 -0700
Committer: Tim Thorpe 
Committed: Tue Oct 10 13:54:01 2017 -0700

--
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../ambari/server/stack/ExtensionHelper.java|  57 ++-
 .../apache/ambari/server/stack/StackModule.java |   4 +
 .../server/stack/StackManagerExtensionTest.java |  31 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   2 +-
 .../stacks_with_extensions/HDP/0.4/metainfo.xml |  22 ++
 .../HDP/0.4/repos/repoinfo.xml  |  63 +++
 .../HDP/0.4/services/HBASE/metainfo.xml |  26 ++
 .../0.4/services/HDFS/configuration/global.xml  | 145 +++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 ++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++
 .../HDP/0.4/services/HDFS/metainfo.xml  |  30 ++
 .../0.4/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.4/services/HIVE/metainfo.xml  |  26 ++
 .../HDP/0.4/services/MAPREDUCE/metainfo.xml |  23 ++
 .../HDP/0.4/services/ZOOKEEPER/metainfo.xml |  26 ++
 19 files changed, 1425 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index 2dd6f12..0c8edfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
@@ -70,7 +70,7 @@ public class AmbariManagementHelper {
*/
   public void createExtensionLink(StackManager stackManager, StackInfo 
stackInfo, ExtensionInfo extensionInfo) throws AmbariException {
 validateCreateExtensionLinkRequest(stackInfo, extensionInfo);
-ExtensionHelper.validateCreateLink(stackInfo, extensionInfo);
+ExtensionHelper.validateCreateLink(stackManager, stackInfo, extensionInfo);
 ExtensionLinkEntity linkEntity = createExtensionLinkEntity(stackInfo, 
extensionInfo);
 stackManager.linkStackToExtension(stackInfo, extensionInfo);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index 86e532a..91dc870 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
 import org.apache.ambari.server.utils.VersionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An extension version is like a stack version but it contains custom 
services.  Linking an extension
@@ -35,6 +37,8 @@ import org.apache.ambari.server.utils.VersionUtils;
  */
 public class ExtensionHelper {
 
+  private final static Logger LOG = 
LoggerFactory.getLogger(ExtensionHelper.class);
+
   public static void validateDeleteLink(Clusters clusters, StackInfo stack, 
ExtensionInfo extension) throws AmbariException {
 validateNotRequiredExtension(stack, extension);
 validateServicesNotInstalled(clusters, stack, extension);
@@ -62,9 +66,9 @@ public class ExtensionHelper {
 }
   }
 
-  public static void validateCreateLink(StackInfo stack, ExtensionInfo 
extension) throws AmbariException {
+  public static void validateCreateLink(StackManager stackManager, StackInfo 
stack, ExtensionInfo extension) throws AmbariException {

[01/50] [abbrv] ambari git commit: AMBARI-22137 - Different stack versions should be able to link to different extension versions [Forced Update!]

2017-10-12 Thread lpuskas 
Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 ac71c44c5 -> b7f03cac8 (forced update)


AMBARI-22137 - Different stack versions should be able to link to different 
extension versions


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 03273bdce970a1282d89056aa48dc2ffe3b7b712
Parents: a3a8afc
Author: Tim Thorpe 
Authored: Tue Oct 10 13:54:01 2017 -0700
Committer: Tim Thorpe 
Committed: Tue Oct 10 13:54:01 2017 -0700

--
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../ambari/server/stack/ExtensionHelper.java|  57 ++-
 .../apache/ambari/server/stack/StackModule.java |   4 +
 .../server/stack/StackManagerExtensionTest.java |  31 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   2 +-
 .../stacks_with_extensions/HDP/0.4/metainfo.xml |  22 ++
 .../HDP/0.4/repos/repoinfo.xml  |  63 +++
 .../HDP/0.4/services/HBASE/metainfo.xml |  26 ++
 .../0.4/services/HDFS/configuration/global.xml  | 145 +++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 ++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++
 .../HDP/0.4/services/HDFS/metainfo.xml  |  30 ++
 .../0.4/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.4/services/HIVE/metainfo.xml  |  26 ++
 .../HDP/0.4/services/MAPREDUCE/metainfo.xml |  23 ++
 .../HDP/0.4/services/ZOOKEEPER/metainfo.xml |  26 ++
 19 files changed, 1425 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index 2dd6f12..0c8edfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
@@ -70,7 +70,7 @@ public class AmbariManagementHelper {
*/
   public void createExtensionLink(StackManager stackManager, StackInfo 
stackInfo, ExtensionInfo extensionInfo) throws AmbariException {
 validateCreateExtensionLinkRequest(stackInfo, extensionInfo);
-ExtensionHelper.validateCreateLink(stackInfo, extensionInfo);
+ExtensionHelper.validateCreateLink(stackManager, stackInfo, extensionInfo);
 ExtensionLinkEntity linkEntity = createExtensionLinkEntity(stackInfo, 
extensionInfo);
 stackManager.linkStackToExtension(stackInfo, extensionInfo);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index 86e532a..91dc870 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
 import org.apache.ambari.server.utils.VersionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An extension version is like a stack version but it contains custom 
services.  Linking an extension
@@ -35,6 +37,8 @@ import org.apache.ambari.server.utils.VersionUtils;
  */
 public class ExtensionHelper {
 
+  private final static Logger LOG = 
LoggerFactory.getLogger(ExtensionHelper.class);
+
   public static void validateDeleteLink(Clusters clusters, StackInfo stack, 
ExtensionInfo extension) throws AmbariException {
 validateNotRequiredExtension(stack, extension);
 validateServicesNotInstalled(clusters, stack, extension);
@@ -62,9 +66,9 @@ public class ExtensionHelper {
 }
   }
 
-  public static void validateCreateLink(StackInfo stack, ExtensionInfo 
extension) throws AmbariException {
+  public static void

[48/50] [abbrv] ambari git commit: AMBARI-22137 - Different stack versions should be able to link to different extension versions

2017-10-11 Thread jaimin 
AMBARI-22137 - Different stack versions should be able to link to different 
extension versions


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

Branch: refs/heads/branch-feature-AMBARI-14714-ui
Commit: 03273bdce970a1282d89056aa48dc2ffe3b7b712
Parents: a3a8afc
Author: Tim Thorpe 
Authored: Tue Oct 10 13:54:01 2017 -0700
Committer: Tim Thorpe 
Committed: Tue Oct 10 13:54:01 2017 -0700

--
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../ambari/server/stack/ExtensionHelper.java|  57 ++-
 .../apache/ambari/server/stack/StackModule.java |   4 +
 .../server/stack/StackManagerExtensionTest.java |  31 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   2 +-
 .../stacks_with_extensions/HDP/0.4/metainfo.xml |  22 ++
 .../HDP/0.4/repos/repoinfo.xml  |  63 +++
 .../HDP/0.4/services/HBASE/metainfo.xml |  26 ++
 .../0.4/services/HDFS/configuration/global.xml  | 145 +++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 ++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++
 .../HDP/0.4/services/HDFS/metainfo.xml  |  30 ++
 .../0.4/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.4/services/HIVE/metainfo.xml  |  26 ++
 .../HDP/0.4/services/MAPREDUCE/metainfo.xml |  23 ++
 .../HDP/0.4/services/ZOOKEEPER/metainfo.xml |  26 ++
 19 files changed, 1425 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index 2dd6f12..0c8edfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
@@ -70,7 +70,7 @@ public class AmbariManagementHelper {
*/
   public void createExtensionLink(StackManager stackManager, StackInfo 
stackInfo, ExtensionInfo extensionInfo) throws AmbariException {
 validateCreateExtensionLinkRequest(stackInfo, extensionInfo);
-ExtensionHelper.validateCreateLink(stackInfo, extensionInfo);
+ExtensionHelper.validateCreateLink(stackManager, stackInfo, extensionInfo);
 ExtensionLinkEntity linkEntity = createExtensionLinkEntity(stackInfo, 
extensionInfo);
 stackManager.linkStackToExtension(stackInfo, extensionInfo);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index 86e532a..91dc870 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
 import org.apache.ambari.server.utils.VersionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An extension version is like a stack version but it contains custom 
services.  Linking an extension
@@ -35,6 +37,8 @@ import org.apache.ambari.server.utils.VersionUtils;
  */
 public class ExtensionHelper {
 
+  private final static Logger LOG = 
LoggerFactory.getLogger(ExtensionHelper.class);
+
   public static void validateDeleteLink(Clusters clusters, StackInfo stack, 
ExtensionInfo extension) throws AmbariException {
 validateNotRequiredExtension(stack, extension);
 validateServicesNotInstalled(clusters, stack, extension);
@@ -62,9 +66,9 @@ public class ExtensionHelper {
 }
   }
 
-  public static void validateCreateLink(StackInfo stack, ExtensionInfo 
extension) throws AmbariException {
+  public static void validateCreateLink(StackManager stackManager, StackInfo 
stack, ExtensionInfo extension) throws AmbariException {

[30/31] ambari git commit: AMBARI-22137 - Different stack versions should be able to link to different extension versions

2017-10-10 Thread jluniya 
AMBARI-22137 - Different stack versions should be able to link to different 
extension versions


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 03273bdce970a1282d89056aa48dc2ffe3b7b712
Parents: a3a8afc
Author: Tim Thorpe 
Authored: Tue Oct 10 13:54:01 2017 -0700
Committer: Tim Thorpe 
Committed: Tue Oct 10 13:54:01 2017 -0700

--
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../ambari/server/stack/ExtensionHelper.java|  57 ++-
 .../apache/ambari/server/stack/StackModule.java |   4 +
 .../server/stack/StackManagerExtensionTest.java |  31 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   2 +-
 .../stacks_with_extensions/HDP/0.4/metainfo.xml |  22 ++
 .../HDP/0.4/repos/repoinfo.xml  |  63 +++
 .../HDP/0.4/services/HBASE/metainfo.xml |  26 ++
 .../0.4/services/HDFS/configuration/global.xml  | 145 +++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 ++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++
 .../HDP/0.4/services/HDFS/metainfo.xml  |  30 ++
 .../0.4/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.4/services/HIVE/metainfo.xml  |  26 ++
 .../HDP/0.4/services/MAPREDUCE/metainfo.xml |  23 ++
 .../HDP/0.4/services/ZOOKEEPER/metainfo.xml |  26 ++
 19 files changed, 1425 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index 2dd6f12..0c8edfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
@@ -70,7 +70,7 @@ public class AmbariManagementHelper {
*/
   public void createExtensionLink(StackManager stackManager, StackInfo 
stackInfo, ExtensionInfo extensionInfo) throws AmbariException {
 validateCreateExtensionLinkRequest(stackInfo, extensionInfo);
-ExtensionHelper.validateCreateLink(stackInfo, extensionInfo);
+ExtensionHelper.validateCreateLink(stackManager, stackInfo, extensionInfo);
 ExtensionLinkEntity linkEntity = createExtensionLinkEntity(stackInfo, 
extensionInfo);
 stackManager.linkStackToExtension(stackInfo, extensionInfo);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index 86e532a..91dc870 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
 import org.apache.ambari.server.utils.VersionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An extension version is like a stack version but it contains custom 
services.  Linking an extension
@@ -35,6 +37,8 @@ import org.apache.ambari.server.utils.VersionUtils;
  */
 public class ExtensionHelper {
 
+  private final static Logger LOG = 
LoggerFactory.getLogger(ExtensionHelper.class);
+
   public static void validateDeleteLink(Clusters clusters, StackInfo stack, 
ExtensionInfo extension) throws AmbariException {
 validateNotRequiredExtension(stack, extension);
 validateServicesNotInstalled(clusters, stack, extension);
@@ -62,9 +66,9 @@ public class ExtensionHelper {
 }
   }
 
-  public static void validateCreateLink(StackInfo stack, ExtensionInfo 
extension) throws AmbariException {
+  public static void validateCreateLink(StackManager stackManager, StackInfo 
stack, ExtensionInfo extension) throws AmbariException {

ambari git commit: AMBARI-22137 - Different stack versions should be able to link to different extension versions

2017-10-10 Thread tthorpe 
Repository: ambari
Updated Branches:
  refs/heads/trunk a3a8afcd6 -> 03273bdce


AMBARI-22137 - Different stack versions should be able to link to different 
extension versions


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

Branch: refs/heads/trunk
Commit: 03273bdce970a1282d89056aa48dc2ffe3b7b712
Parents: a3a8afc
Author: Tim Thorpe 
Authored: Tue Oct 10 13:54:01 2017 -0700
Committer: Tim Thorpe 
Committed: Tue Oct 10 13:54:01 2017 -0700

--
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../ambari/server/stack/ExtensionHelper.java|  57 ++-
 .../apache/ambari/server/stack/StackModule.java |   4 +
 .../server/stack/StackManagerExtensionTest.java |  31 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   2 +-
 .../stacks_with_extensions/HDP/0.4/metainfo.xml |  22 ++
 .../HDP/0.4/repos/repoinfo.xml  |  63 +++
 .../HDP/0.4/services/HBASE/metainfo.xml |  26 ++
 .../0.4/services/HDFS/configuration/global.xml  | 145 +++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 ++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++
 .../HDP/0.4/services/HDFS/metainfo.xml  |  30 ++
 .../0.4/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.4/services/HIVE/metainfo.xml  |  26 ++
 .../HDP/0.4/services/MAPREDUCE/metainfo.xml |  23 ++
 .../HDP/0.4/services/ZOOKEEPER/metainfo.xml |  26 ++
 19 files changed, 1425 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index 2dd6f12..0c8edfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
@@ -70,7 +70,7 @@ public class AmbariManagementHelper {
*/
   public void createExtensionLink(StackManager stackManager, StackInfo 
stackInfo, ExtensionInfo extensionInfo) throws AmbariException {
 validateCreateExtensionLinkRequest(stackInfo, extensionInfo);
-ExtensionHelper.validateCreateLink(stackInfo, extensionInfo);
+ExtensionHelper.validateCreateLink(stackManager, stackInfo, extensionInfo);
 ExtensionLinkEntity linkEntity = createExtensionLinkEntity(stackInfo, 
extensionInfo);
 stackManager.linkStackToExtension(stackInfo, extensionInfo);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index 86e532a..91dc870 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
 import org.apache.ambari.server.utils.VersionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An extension version is like a stack version but it contains custom 
services.  Linking an extension
@@ -35,6 +37,8 @@ import org.apache.ambari.server.utils.VersionUtils;
  */
 public class ExtensionHelper {
 
+  private final static Logger LOG = 
LoggerFactory.getLogger(ExtensionHelper.class);
+
   public static void validateDeleteLink(Clusters clusters, StackInfo stack, 
ExtensionInfo extension) throws AmbariException {
 validateNotRequiredExtension(stack, extension);
 validateServicesNotInstalled(clusters, stack, extension);
@@ -62,9 +66,9 @@ public class ExtensionHelper {
 }
   }
 
-  public static void validateCreateLink(StackInfo stack, ExtensionInfo 
extension) throws AmbariException {
+  public static void validateCreateLink(StackManager stackManager, StackInfo 
stack, ExtensionInfo