You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2017/09/12 01:41:32 UTC

ambari git commit: AMBARI-21918: Mpack Generator Tool to generate mpack from stack definition - Fix build break (jluniya)

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 6f8d546aa -> efaae847b


AMBARI-21918: Mpack Generator Tool to generate mpack from stack definition - Fix build break (jluniya)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: efaae847b1cf68233e4fe71659f0bcd40a59f4ac
Parents: 6f8d546
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Mon Sep 11 18:41:28 2017 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Mon Sep 11 18:41:28 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/mpack/MpackGenerator.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/efaae847/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackGenerator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackGenerator.java b/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackGenerator.java
index f7654ca..9eee629 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackGenerator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackGenerator.java
@@ -39,8 +39,8 @@ import java.util.Map;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 
-import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.stack.ServiceDirectory;
+import org.apache.ambari.server.stack.StackDirectory;
 import org.apache.ambari.server.stack.StackManager;
 import org.apache.ambari.server.state.Mpack;
 import org.apache.ambari.server.state.Packlet;
@@ -142,12 +142,12 @@ public class MpackGenerator {
     StackInfo srcStackInfo = stackManager.getStack(srcStackId.getStackName(), srcStackId.getStackVersion());
     StackRoleCommandOrder stackRoleCommandOrder = srcStackInfo.getRoleCommandOrder();
     FileWriter stackRCOFile = new FileWriter(
-      mpackRootDir.getAbsolutePath() + File.separator + AmbariMetaInfo.RCO_FILE_NAME);
+      mpackRootDir.getAbsolutePath() + File.separator + StackDirectory.RCO_FILE_NAME);
     mapper.writerWithDefaultPrettyPrinter().writeValue(stackRCOFile, stackRoleCommandOrder.getContent());
 
     // Export stack configs
     File stackConfigDir = new File(
-      mpackRootDir.getAbsolutePath() + File.separator + AmbariMetaInfo.SERVICE_CONFIG_FOLDER_NAME);
+      mpackRootDir.getAbsolutePath() + File.separator + StackDirectory.SERVICE_CONFIG_FOLDER_NAME);
     exportConfigs(srcStackInfo.getProperties(), stackConfigDir);
 
     // Export widgets.json