git commit: AMBARI-5732 - Views: Pig and File Views need to be built and packaged as part of Ambari
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 +artifactIdmaven-assembly-plugin/artifactId +executions + execution +phasepackage/phase +goals + goalattached/goal +/goals + /execution +/executions +configuration + descriptorRefs +descriptorRefjar-with-dependencies/descriptorRef + /descriptorRefs + outputDirectory${basedir}/target/outputDirectory +/configuration + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-compiler-plugin/artifactId +version3.1/version +configuration + source1.6/source + target1.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 +artifactIdmaven-assembly-plugin/artifactId +executions + execution +phasepackage/phase +goals + goalattached/goal +/goals + /execution +/executions +configuration + descriptorRefs +descriptorRefjar-with-dependencies/descriptorRef + /descriptorRefs + outputDirectory${basedir}/target/outputDirectory +/configuration + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-compiler-plugin/artifactId +version3.1/version +configuration + source1.6/source + target1.6/target +/configuration + /plugin /plugins - resources resource directorysrc/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 @@
git commit: AMBARI-5732 - Views: Pig and File Views need to be built and packaged as part of Ambari - 2
Repository: ambari Updated Branches: refs/heads/trunk c4bb5bcbf - a41198d50 AMBARI-5732 - Views: Pig and File Views need to be built and packaged as part of Ambari - 2 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a41198d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a41198d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a41198d5 Branch: refs/heads/trunk Commit: a41198d502738e1bb158aeb96314d33baa4a37e4 Parents: c4bb5bc Author: tbeerbower tbeerbo...@hortonworks.com Authored: Mon May 12 11:19:50 2014 -0400 Committer: tbeerbower tbeerbo...@hortonworks.com Committed: Mon May 12 11:20:04 2014 -0400 -- contrib/views/files/pom.xml | 2 +- contrib/views/pig/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a41198d5/contrib/views/files/pom.xml -- diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index dec1f8c..4747109 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.ambari.views/groupId -artifactIdambari-views/artifactId +artifactIdambari-contrib-views/artifactId version0.1.0-SNAPSHOT/version /parent http://git-wip-us.apache.org/repos/asf/ambari/blob/a41198d5/contrib/views/pig/pom.xml -- diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml index 13dbff0..aa844f9 100644 --- a/contrib/views/pig/pom.xml +++ b/contrib/views/pig/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.ambari.views/groupId -artifactIdambari-views/artifactId +artifactIdambari-contrib-views/artifactId version0.1.0-SNAPSHOT/version /parent
git commit: AMBARI-5732 - Views: Pig and File Views need to be built and packaged as part of Ambari - 2
Repository: ambari Updated Branches: refs/heads/branch-1.6.0 029e7ffa9 - 465ca755b AMBARI-5732 - Views: Pig and File Views need to be built and packaged as part of Ambari - 2 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/465ca755 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/465ca755 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/465ca755 Branch: refs/heads/branch-1.6.0 Commit: 465ca755b5b3b1d954731e229d6b27ec881ef01e Parents: 029e7ff Author: tbeerbower tbeerbo...@hortonworks.com Authored: Mon May 12 11:23:03 2014 -0400 Committer: tbeerbower tbeerbo...@hortonworks.com Committed: Mon May 12 11:23:03 2014 -0400 -- contrib/views/files/pom.xml | 2 +- contrib/views/pig/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/465ca755/contrib/views/files/pom.xml -- diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index dec1f8c..4747109 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.ambari.views/groupId -artifactIdambari-views/artifactId +artifactIdambari-contrib-views/artifactId version0.1.0-SNAPSHOT/version /parent http://git-wip-us.apache.org/repos/asf/ambari/blob/465ca755/contrib/views/pig/pom.xml -- diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml index 13dbff0..aa844f9 100644 --- a/contrib/views/pig/pom.xml +++ b/contrib/views/pig/pom.xml @@ -24,7 +24,7 @@ parent groupIdorg.apache.ambari.views/groupId -artifactIdambari-views/artifactId +artifactIdambari-contrib-views/artifactId version0.1.0-SNAPSHOT/version /parent