ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: AMBARI-20218. Jars clean up.(vbrodetskyi)
Date Tue, 28 Feb 2017 14:18:07 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 76c1fc247 -> c5df14f5e


AMBARI-20218. Jars clean up.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: c5df14f5ea5f1fe9f227131329335488af5f3168
Parents: 76c1fc2
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Tue Feb 28 15:21:09 2017 +0200
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Tue Feb 28 15:21:09 2017 +0200

----------------------------------------------------------------------
 ambari-agent/pom.xml                            | 19 ++++++++++
 ambari-agent/src/packages/tarball/all.xml       |  1 +
 .../src/main/assembly/sink.xml                  | 12 +++---
 .../src/main/assemblies/jar-with-common.xml     |  2 +-
 .../src/main/assemblies/jar-with-common.xml     |  4 +-
 .../src/main/assemblies/jar-with-common.xml     |  2 +-
 .../src/main/assemblies/simulator.xml           |  4 +-
 ambari-server/src/main/assemblies/server.xml    | 40 +++++++++++++++++---
 .../python/ambari_server/serverConfiguration.py |  3 ++
 9 files changed, 69 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 7633b95..79545d6 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -351,6 +351,25 @@
               <sources>
                 <source>
                   <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var/lib/ambari-agent</location>
+
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/var/lib/ambari-agent</directory>
+              <filemode>644</filemode>
+              <username>root</username>
+              <groupname>root</groupname>
+              <sources>
+                <source>
+                  <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var/lib/ambari-agent</location>
+                  <includes>
+                    <include>/cred/lib/*.jar</include>
+                    <include>/tools/zkmigrator.jar</include>
+                    <include>/cache/stacks/HDP/2.1.GlusterFS/services/STORM/package/files/wordCount.jar</include>
+                    <include>/cache/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar</include>
+                    <include>/cache/common-services/STORM/0.9.1/package/files/wordCount.jar</include>
+                  </includes>
                 </source>
               </sources>
             </mapping>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-agent/src/packages/tarball/all.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/src/packages/tarball/all.xml b/ambari-agent/src/packages/tarball/all.xml
index e88d3bc..88a42a1 100644
--- a/ambari-agent/src/packages/tarball/all.xml
+++ b/ambari-agent/src/packages/tarball/all.xml
@@ -192,6 +192,7 @@
   </files>
   <dependencySets>
     <dependencySet>
+      <fileMode>644</fileMode>
       <outputDirectory>/var/lib/${project.artifactId}/cred/lib</outputDirectory>
       <unpack>false</unpack>
       <includes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
index 4dd6084..34cdbc3 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
@@ -50,27 +50,27 @@
 
   <files>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${hadoop-sink.dir}/target/ambari-metrics-hadoop-sink-with-common-${project.version}.jar</source>
       <outputDirectory>hadoop-sink</outputDirectory>
     </file>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${flume-sink.dir}/target/ambari-metrics-flume-sink-with-common-${project.version}.jar</source>
       <outputDirectory>hadoop-sink</outputDirectory>
     </file>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${storm-sink.dir}/target/ambari-metrics-storm-sink-with-common-${project.version}.jar</source>
       <outputDirectory>hadoop-sink</outputDirectory>
     </file>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${storm-sink-legacy.dir}/target/ambari-metrics-storm-sink-legacy-with-common-${project.version}.jar</source>
       <outputDirectory>hadoop-sink</outputDirectory>
     </file>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${kafka-sink.dir}/target/ambari-metrics-kafka-sink-with-common-${project.version}.jar</source>
       <outputDirectory>hadoop-sink</outputDirectory>
     </file>
@@ -79,4 +79,4 @@
 
 
 
-</assembly>
\ No newline at end of file
+</assembly>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
b/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
index cef956c..bfd8b29 100644
--- a/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
+++ b/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
@@ -23,7 +23,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <dependencySets>
     <dependencySet>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
       <includes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
index 058a8bb..16dc00e 100644
--- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
+++ b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
@@ -26,7 +26,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <dependencySets>
     <dependencySet>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
       <includes>
@@ -35,4 +35,4 @@
       </includes>
     </dependencySet>
   </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
b/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
index 7eb9774..c9f435f 100644
--- a/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
+++ b/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
@@ -23,7 +23,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <dependencySets>
     <dependencySet>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
       <includes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
b/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
index b582096..31c9207 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
@@ -24,7 +24,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <files>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${project.build.directory}/${artifact.artifactId}-simulator-${artifact.version}.jar</source>
       <outputDirectory>ambari-metrics-${project.version}/lib/ambari-metrics</outputDirectory>
     </file>
@@ -67,4 +67,4 @@
     </dependencySet>
   </dependencySets>
 
-</assembly>
\ No newline at end of file
+</assembly>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-server/src/main/assemblies/server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml
index 1c609a9..cc9ad0f 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -132,7 +132,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <directory>${ambari-admin-dir}/target</directory>
       <outputDirectory>/var/lib/ambari-server/resources/views</outputDirectory>
       <includes>
@@ -149,9 +149,21 @@
       <directory>src/main/resources/upgrade/dml</directory>
       <outputDirectory>/var/lib/ambari-server/resources/upgrade/dml</outputDirectory>
     </fileSet>
-     <fileSet>
+    <fileSet>
+      <fileMode>755</fileMode>
+      <directory>${commonServicesSrcLocation}</directory>
+      <outputDirectory>/var/lib/ambari-server/resources/common-services</outputDirectory>
+      <excludes>
+	    <exclude>/STORM/0.9.1/package/files/wordCount.jar</exclude>
+	  </excludes>
+    </fileSet>
+    <fileSet>
+      <fileMode>644</fileMode>
       <directory>${commonServicesSrcLocation}</directory>
       <outputDirectory>/var/lib/ambari-server/resources/common-services</outputDirectory>
+      <includes>
+	    <include>/STORM/0.9.1/package/files/wordCount.jar</include>
+	  </includes>
     </fileSet>
     <fileSet>
       <fileMode>755</fileMode>
@@ -159,8 +171,22 @@
       <outputDirectory>/var/lib/ambari-server/resources/upgrade/catalog</outputDirectory>
     </fileSet>
     <fileSet>
+      <fileMode>755</fileMode>
+      <directory>${stacksSrcLocation}</directory>
+      <outputDirectory>/var/lib/ambari-server/resources/stacks/${stack.distribution}</outputDirectory>
+      <excludes>
+	    <exclude>/2.1.GlusterFS/services/STORM/package/files/wordCount.jar</exclude>
+        <exclude>/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar</exclude>
+	  </excludes>
+    </fileSet>
+    <fileSet>
+      <fileMode>644</fileMode>
       <directory>${stacksSrcLocation}</directory>
       <outputDirectory>/var/lib/ambari-server/resources/stacks/${stack.distribution}</outputDirectory>
+      <includes>
+	    <include>/2.1.GlusterFS/services/STORM/package/files/wordCount.jar</include>
+        <include>/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar</include>
+	  </includes>
     </fileSet>
     <fileSet>
       <fileMode>755</fileMode>
@@ -173,10 +199,12 @@
       <outputDirectory>/var/lib/ambari-server/resources/custom_action_definitions</outputDirectory>
     </fileSet>
     <fileSet>
+      <fileMode>755</fileMode>
       <directory>${customActionsRoot}</directory>
       <outputDirectory>/var/lib/ambari-server/resources/custom_actions</outputDirectory>
     </fileSet>
     <fileSet>
+      <fileMode>755</fileMode>
       <directory>src/main/resources/host_scripts</directory>
       <outputDirectory>/var/lib/ambari-server/resources/host_scripts</outputDirectory>
     </fileSet>
@@ -200,7 +228,7 @@
   -->
   <files>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
       <outputDirectory>/usr/lib/ambari-server</outputDirectory>
     </file>
@@ -330,12 +358,12 @@
       <outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
     </file>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${project.build.directory}/DBConnectionVerification.jar</source>
       <outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
     </file>
     <file>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <source>${project.build.directory}/CredentialUtil.jar</source>
       <outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
     </file>
@@ -386,7 +414,7 @@
   </files>    
   <dependencySets>
     <dependencySet>
-      <fileMode>755</fileMode>
+      <fileMode>644</fileMode>
       <outputDirectory>/usr/lib/ambari-server</outputDirectory>
       <unpack>false</unpack>
       <scope>compile</scope>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c5df14f5/ambari-server/src/main/python/ambari_server/serverConfiguration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index 0b4af4f..2c0ab90 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -548,6 +548,9 @@ class ServerConfigDefaultsLinux(ServerConfigDefaults):
       (AmbariPath.get("/var/lib/ambari-server/data/tmp/"), "755", "{0}", False),
       (AmbariPath.get("/var/lib/ambari-server/data/cache/"), "600", "{0}", True),
       (AmbariPath.get("/var/lib/ambari-server/data/cache/"), "700", "{0}", False),
+      (AmbariPath.get("/var/lib/ambari-server/resources/common-services/STORM/0.9.1/package/files/wordCount.jar"),
"644", "{0}", False),
+      (AmbariPath.get("/var/lib/ambari-server/resources/stacks/HDP/2.1.GlusterFS/services/STORM/package/files/wordCount.jar"),
"644", "{0}", False),
+      (AmbariPath.get("/var/lib/ambari-server/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar"),
"644", "{0}", False),
       # Also, /etc/ambari-server/conf/password.dat
       # is generated later at store_password_file
     ]


Mime
View raw message