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-11500: [WinTP2] Include windows embedded hbase distribution into AMS collector (jluniya)
Date Fri, 29 May 2015 00:19:24 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3d8e9acc9 -> c74ebac52


AMBARI-11500: [WinTP2] Include windows embedded hbase distribution into AMS collector (jluniya)


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

Branch: refs/heads/trunk
Commit: c74ebac528eadb0f6b4e0578a1188c60e4f99696
Parents: 3d8e9ac
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Thu May 28 17:19:00 2015 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Thu May 28 17:19:00 2015 -0700

----------------------------------------------------------------------
 ambari-metrics/ambari-metrics-assembly/pom.xml  | 164 +++++++++++--------
 .../src/main/assembly/collector-windows.xml     |   8 +
 .../ambari-metrics-timelineservice/pom.xml      | 115 +++++++++----
 ambari-metrics/pom.xml                          |   2 +
 4 files changed, 197 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c74ebac5/ambari-metrics/ambari-metrics-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index 56e8a38..6359c36 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -136,49 +136,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <id>download-hadoop</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target name="Downloading Hadoop">
-                <mkdir dir="${project.build.directory}/embedded" />
-                <get
-                  src="${hadoop.tar}"
-                  dest="${project.build.directory}/embedded/hadoop.tar.gz"
-                  usetimestamp="true"
-                  />
-                <untar
-                  src="${project.build.directory}/embedded/hadoop.tar.gz"
-                  dest="${project.build.directory}/embedded"
-                  compression="gzip"
-                  />
-                <!-- Resolving symlinks-->
-                <move todir="${project.build.directory}/embedded/${hadoop.folder}/lib/native/">
-                  <fileset dir="${project.build.directory}/embedded/${hadoop.folder}/lib/native/"/>
-                  <mapper type="regexp" from="libsnappy.so.1.1.*" to="libsnappy.so.1"/>
-                </move>
-                <move
-                  file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so.0.0.0"
-                  tofile="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so"
-                  />
-                <move
-                  file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so.1.0.0"
-                  tofile="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so"
-                  />
-                <delete file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libsnappy.so"/>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -870,6 +827,74 @@
       </build>
     </profile>
     <profile>
+      <id>linux</id>
+      <activation>
+        <os>
+          <family>unix</family>
+        </os>
+      </activation>
+      <properties>
+        <envClassifier>linux</envClassifier>
+        <dirsep>/</dirsep>
+        <pathsep>:</pathsep>
+        <executable.python>${project.basedir}/../ambari-common/src/main/unix/ambari-python-wrap</executable.python>
+        <executable.shell>sh</executable.shell>
+        <fileextension.shell>sh</fileextension.shell>
+        <fileextension.dot.shell-default></fileextension.dot.shell-default>
+        <assemblydescriptor.collector>src/main/assembly/collector.xml</assemblydescriptor.collector>
+        <assemblydescriptor.monitor>src/main/assembly/monitor.xml</assemblydescriptor.monitor>
+        <assemblydescriptor.sink>src/main/assembly/sink.xml</assemblydescriptor.sink>
+        <packagingFormat>jar</packagingFormat>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>download-hadoop</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="Downloading Hadoop">
+                    <mkdir dir="${project.build.directory}/embedded" />
+                    <get
+                      src="${hadoop.tar}"
+                      dest="${project.build.directory}/embedded/hadoop.tar.gz"
+                      usetimestamp="true"
+                      />
+                    <untar
+                      src="${project.build.directory}/embedded/hadoop.tar.gz"
+                      dest="${project.build.directory}/embedded"
+                      compression="gzip"
+                      />
+                    <!-- Resolving symlinks-->
+                    <move todir="${project.build.directory}/embedded/${hadoop.folder}/lib/native/">
+                      <fileset dir="${project.build.directory}/embedded/${hadoop.folder}/lib/native/"/>
+                      <mapper type="regexp" from="libsnappy.so.1.1.*" to="libsnappy.so.1"/>
+                    </move>
+                    <move
+                      file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so.0.0.0"
+                      tofile="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so"
+                      />
+                    <move
+                      file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so.1.0.0"
+                      tofile="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so"
+                      />
+                    <delete file="${project.build.directory}/embedded/${hadoop.folder}/lib/native/libsnappy.so"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>windows</id>
       <activation>
         <os>
@@ -893,27 +918,38 @@
         <packagingFormat>jar</packagingFormat>
         <python.build.version>2.7</python.build.version>
       </properties>
-    </profile>
-    <profile>
-      <id>linux</id>
-      <activation>
-        <os>
-          <family>unix</family>
-        </os>
-      </activation>
-      <properties>
-        <envClassifier>linux</envClassifier>
-        <dirsep>/</dirsep>
-        <pathsep>:</pathsep>
-        <executable.python>${project.basedir}/../ambari-common/src/main/unix/ambari-python-wrap</executable.python>
-        <executable.shell>sh</executable.shell>
-        <fileextension.shell>sh</fileextension.shell>
-        <fileextension.dot.shell-default></fileextension.dot.shell-default>
-        <assemblydescriptor.collector>src/main/assembly/collector.xml</assemblydescriptor.collector>
-        <assemblydescriptor.monitor>src/main/assembly/monitor.xml</assemblydescriptor.monitor>
-        <assemblydescriptor.sink>src/main/assembly/sink.xml</assemblydescriptor.sink>
-        <packagingFormat>jar</packagingFormat>
-      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>download-hadoop</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="Downloading Hadoop">
+                    <mkdir dir="${project.build.directory}/embedded" />
+                    <get
+                      src="${hadoop.winpkg.zip}"
+                      dest="${project.build.directory}/embedded/hadoop.zip"
+                      usetimestamp="true"
+                      />
+                    <unzip
+                      src="${project.build.directory}/embedded/hadoop.zip"
+                      dest="${project.build.directory}/embedded/hadoop.temp"
+                      />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>choco</id>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c74ebac5/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 31f93fd..67dd5c0 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
@@ -79,6 +79,14 @@
         <include>*.json</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.folder}/bin</directory>
+      <outputDirectory>hbase/bin</outputDirectory>
+      <includes>
+        <include>*.dll</include>
+        <include>*.exe</include>
+      </includes>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c74ebac5/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 2485661..3c79190 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -90,34 +90,6 @@
         <version>3.0</version>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target name="Download HBase">
-                <mkdir dir="${project.build.directory}/embedded" />
-                <get
-                  src="${hbase.tar}"
-                  dest="${project.build.directory}/embedded/hbase.tar.gz"
-                  usetimestamp="true"
-                  />
-                <untar
-                  src="${project.build.directory}/embedded/hbase.tar.gz"
-                  dest="${project.build.directory}/embedded"
-                  compression="gzip"
-                  />
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>rpm-maven-plugin</artifactId>
         <version>2.0.1</version>
@@ -543,6 +515,93 @@
 
   <profiles>
     <profile>
+      <id>linux</id>
+      <activation>
+        <os>
+          <family>unix</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="Download HBase">
+                    <mkdir dir="${project.build.directory}/embedded" />
+                    <get
+                      src="${hbase.tar}"
+                      dest="${project.build.directory}/embedded/hbase.tar.gz"
+                      usetimestamp="true"
+                      />
+                    <untar
+                      src="${project.build.directory}/embedded/hbase.tar.gz"
+                      dest="${project.build.directory}/embedded"
+                      compression="gzip"
+                      />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>windows</id>
+      <activation>
+        <os>
+          <family>win</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="Download HBase">
+                    <mkdir dir="${project.build.directory}/embedded" />
+                    <get
+                      src="${hbase.winpkg.zip}"
+                      dest="${project.build.directory}/embedded/hbase.zip"
+                      usetimestamp="true"
+                      />
+                    <unzip
+                      src="${project.build.directory}/embedded/hbase.zip"
+                      dest="${project.build.directory}/embedded/hbase.temp"
+                      />
+                    <unzip
+                      src="${project.build.directory}/embedded/hbase.temp/resources/${hbase.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"
+                      />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>sim</id>
       <build>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c74ebac5/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index f0cb433..e57d2a2 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -42,6 +42,8 @@
       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>
     <resmonitor.install.dir>
       /usr/lib/python2.6/site-packages/resource_monitoring
     </resmonitor.install.dir>


Mime
View raw message