ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject git commit: AMBARI-5732 - Views: Pig and File Views need to be built and packaged as part of Ambari
Date Mon, 12 May 2014 14:49:40 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 1e19f079b -> ca3cce1a5


AMBARI-5732 - Views: Pig and File Views need to be built and packaged as part of Ambari


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

Branch: refs/heads/trunk
Commit: ca3cce1a5fa76a202ca91abb75d5badab891ef6a
Parents: 1e19f07
Author: tbeerbower <tbeerbower@hortonworks.com>
Authored: Mon May 12 09:51:39 2014 -0400
Committer: tbeerbower <tbeerbower@hortonworks.com>
Committed: Mon May 12 10:36:21 2014 -0400

----------------------------------------------------------------------
 ambari-server/pom.xml       | 14 +++++++
 contrib/views/files/pom.xml | 26 +++++++++++++
 contrib/views/pig/pom.xml   | 28 +++++++++++++-
 contrib/views/pom.xml       | 79 +++++++++++++++++++++++++---------------
 pom.xml                     |  4 +-
 5 files changed, 119 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ca3cce1a/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 5b465eb..6f12cd4 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -245,6 +245,20 @@
                 </source>
               </sources>
             </mapping>
+            <!-- Put the contrib views in the view directory for deployment -->
+            <mapping>
+              <directory>/var/lib/ambari-server/resources/views</directory>
+              <sources>
+                <source>
+                  <location>
+                    ${project.basedir}/../contrib/views/target/views
+                  </location>
+                  <includes>
+                    <include>*.jar</include>
+                  </includes>
+                </source>
+              </sources>
+            </mapping>
             <mapping>
               <directory>${common_functions.install.dir}</directory>
               <sources>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ca3cce1a/contrib/views/files/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml
index 6ea35d4..dec1f8c 100644
--- a/contrib/views/files/pom.xml
+++ b/contrib/views/files/pom.xml
@@ -182,6 +182,32 @@
             </execution>
         </executions>
         </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <outputDirectory>${basedir}/target</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
     </plugins>
     <resources>
         <resource>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ca3cce1a/contrib/views/pig/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index 757089d..13dbff0 100644
--- a/contrib/views/pig/pom.xml
+++ b/contrib/views/pig/pom.xml
@@ -175,9 +175,33 @@
           </execution>
         </executions>
       </plugin>
-
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <outputDirectory>${basedir}/target</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
     </plugins>
-
     <resources>
       <resource>
         <directory>src/main/resources</directory>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ca3cce1a/contrib/views/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml
index 5dc4038..26bc663 100644
--- a/contrib/views/pom.xml
+++ b/contrib/views/pom.xml
@@ -18,10 +18,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari.views</groupId>
-  <artifactId>ambari-views</artifactId>
+  <artifactId>ambari-contrib-views</artifactId>
   <packaging>pom</packaging>
   <version>0.1.0-SNAPSHOT</version>
-  <name>Ambari Views</name>
+  <name>Ambari Contrib Views</name>
   <modules>
     <module>files</module>
     <module>pig</module>
@@ -62,35 +62,56 @@
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-          <outputDirectory>${basedir}/target</outputDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
     </plugins>
-
   </build>
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <!-- Copy only the contrib views that we want included for default deployment
-->
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>2.6</version>
+            <executions>
+              <execution>
+                <id>copy-amabri-views</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <!-- View archives in target/views will be deployed with an Ambari server
install -->
+                  <outputDirectory>${basedir}/target/views</outputDirectory>
+                  <resources>
+                    <!-- PIG view -->
+                    <resource>
+                      <directory>${basedir}/pig/target/</directory>
+                      <includes>
+                        <include>*-dependencies.jar</include>
+                      </includes>
+                      <filtering>true</filtering>
+                    </resource>
+                    <!-- FILES view -->
+                    <resource>
+                      <directory>${basedir}/files/target/</directory>
+                      <includes>
+                        <include>*-dependencies.jar</include>
+                      </includes>
+                      <filtering>true</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
   <dependencyManagement>
     <dependencies>
       <dependency>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ca3cce1a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 38d0aef..2f2af5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
             <exclude>derby.log</exclude>
             <exclude>CHANGES.txt</exclude>
             <exclude>pass.txt</exclude>
-            <exclude>contrib/addons/test/dataServices/jmx/data/cluster_configuration.json.nohbase</exclude>
+                   <exclude>contrib/addons/test/dataServices/jmx/data/cluster_configuration.json.nohbase</exclude>
             <exclude>contrib/ambari-scom/msi/src/GUI_Ambari.sln</exclude>
             <exclude>version</exclude>
             <!--IDE and GIT files-->
@@ -239,6 +239,7 @@
         <module>ambari-web</module>
         <module>ambari-project</module>
         <module>ambari-views</module>
+        <module>contrib/views/</module>
         <module>ambari-server</module>
         <module>ambari-agent</module>
         <module>ambari-client</module>
@@ -249,6 +250,7 @@
       <modules>
         <module>ambari-project</module>
         <module>ambari-views</module>
+        <module>contrib/views/</module>
         <module>ambari-server</module>
         <module>ambari-agent</module>
         <module>ambari-client</module>


Mime
View raw message