Repository: ambari Updated Branches: refs/heads/branch-1.6.0 6a29f0acb -> 029e7ffa9
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/029e7ffa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/029e7ffa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/029e7ffa Branch: refs/heads/branch-1.6.0 Commit: 029e7ffa9f828be53dae4a03039ccf23d673aafc Parents: 6a29f0a Author: tbeerbower <tbeerbo...@hortonworks.com> Authored: Mon May 12 11:03:50 2014 -0400 Committer: tbeerbower <tbeerbo...@hortonworks.com> Committed: Mon May 12 11:04:32 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 | 2 + 5 files changed, 118 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/029e7ffa/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 18cf077..317f8bd 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/029e7ffa/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/029e7ffa/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/029e7ffa/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/029e7ffa/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 38d0aef..f528879 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
