ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for embedded hbase (jluniya)
Date Mon, 15 Jun 2015 05:15:15 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 18ef979bd -> a0a2524a5


AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for embedded hbase
(jluniya)


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

Branch: refs/heads/trunk
Commit: a0a2524a50ea80ef7ec49f3a705de860bcc1cfec
Parents: 18ef979
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Sun Jun 14 22:15:07 2015 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Sun Jun 14 22:15:07 2015 -0700

----------------------------------------------------------------------
 .../src/main/assembly/collector-windows.xml                    | 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml          | 4 ++--
 ambari-metrics/pom.xml                                         | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a2524a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
index 67dd5c0..4f1ad47 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
@@ -27,7 +27,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>${collector.dir}/target/embedded/${hbase.folder}</directory>
+      <directory>${collector.dir}/target/embedded/${hbase.winpkg.folder}</directory>
       <outputDirectory>hbase</outputDirectory>
     </fileSet>
     <fileSet>
@@ -80,7 +80,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.folder}/bin</directory>
+      <directory>${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.winpkg.folder}/bin</directory>
       <outputDirectory>hbase/bin</outputDirectory>
       <includes>
         <include>*.dll</include>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a2524a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 3c79190..999005a 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -586,12 +586,12 @@
                       dest="${project.build.directory}/embedded/hbase.temp"
                       />
                     <unzip
-                      src="${project.build.directory}/embedded/hbase.temp/resources/${hbase.folder}.zip"
+                      src="${project.build.directory}/embedded/hbase.temp/resources/${hbase.winpkg.folder}.zip"
                       dest="${project.build.directory}/embedded"
                       />
                     <copy
                       file="${project.build.directory}/embedded/hbase.temp/resources/servicehost.exe"
-                      tofile="${project.build.directory}/embedded/${hbase.folder}/bin/ams_hbase_master.exe"
+                      tofile="${project.build.directory}/embedded/${hbase.winpkg.folder}/bin/ams_hbase_master.exe"
                       />
                   </target>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a2524a/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 106f79b..b4f4ed3 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -40,8 +40,10 @@
     <hbase.folder>hbase-0.98.4.2.2.0.0-2041-hadoop2</hbase.folder>
     <hadoop.tar>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hadoop-2.6.0.2.2.0.0-2041.tar.gz</hadoop.tar>
     <hadoop.folder>hadoop-2.6.0.2.2.0.0-2041</hadoop.folder>
-    <hbase.winpkg.zip>file:///c:/hbase_embedded/hbase-0.98.4.2.2.0.0-2041-hadoop2.winpkg.zip</hbase.winpkg.zip>
-    <hadoop.winpkg.zip>file:///c:/hbase_embedded/hadoop-2.6.0.2.2.0.0-2041.winpkg.zip</hadoop.winpkg.zip>
+    <hbase.winpkg.zip>https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hbase-0.98.4.2.2.4.2-0002-hadoop2.winpkg.zip</hbase.winpkg.zip>
+    <hbase.winpkg.folder>hbase-0.98.4.2.2.4.2-0002-hadoop2</hbase.winpkg.folder>
+    <hadoop.winpkg.zip>https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hadoop-2.6.0.2.2.4.2-0002.winpkg.zip</hadoop.winpkg.zip>
+    <hadoop.winpkg.folder>hadoop-2.6.0.2.2.4.2-0002</hadoop.winpkg.folder>
     <resmonitor.install.dir>
       /usr/lib/python2.6/site-packages/resource_monitoring
     </resmonitor.install.dir>


Mime
View raw message