Repository: ambari Updated Branches: refs/heads/trunk acfb1db9c -> 25e74f958
AMBARI-3567. Make provisions for ambari-web/public content to be read from a static location. (croberts via Trevor McKay) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/25e74f95 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/25e74f95 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/25e74f95 Branch: refs/heads/trunk Commit: 25e74f9589d662b7e962cf98de13bb5bda40713f Parents: acfb1db Author: Chad Roberts <[email protected]> Authored: Fri Feb 28 13:43:49 2014 -0500 Committer: Chad Roberts <[email protected]> Committed: Fri Feb 28 13:43:49 2014 -0500 ---------------------------------------------------------------------- ambari-server/pom.xml | 3 ++- pom.xml | 32 ++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/25e74f95/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 0da58d1..24c78ff 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -27,6 +27,7 @@ <python.ver>python >= 2.6</python.ver> <custom.tests>false</custom.tests> <hdpUrlForCentos6>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.1.1.0</hdpUrlForCentos6> + <ambari-web-dir>${basedir}/../ambari-web/public</ambari-web-dir> </properties> <build> <plugins> @@ -208,7 +209,7 @@ <directory>/usr/lib/ambari-server/web</directory> <sources> <source> - <location>${basedir}/../ambari-web/public</location> + <location>${ambari-web-dir}</location> <includes> <include>**</include> </includes> http://git-wip-us.apache.org/repos/asf/ambari/blob/25e74f95/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 33948b2..6b155bc 100644 --- a/pom.xml +++ b/pom.xml @@ -47,14 +47,6 @@ <url>http://download.java.net/maven/glassfish/</url> </pluginRepository> </pluginRepositories> - <modules> - <module>ambari-web</module> - <module>ambari-project</module> - <module>ambari-views</module> - <module>ambari-server</module> - <module>ambari-agent</module> - <module>ambari-client</module> - </modules> <build> <pluginManagement> <plugins> @@ -166,6 +158,30 @@ </build> <profiles> <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>ambari-web</module> + <module>ambari-project</module> + <module>ambari-views</module> + <module>ambari-server</module> + <module>ambari-agent</module> + <module>ambari-client</module> + </modules> + </profile> + <profile> + <id>static-web</id> + <modules> + <module>ambari-project</module> + <module>ambari-views</module> + <module>ambari-server</module> + <module>ambari-agent</module> + <module>ambari-client</module> + </modules> + </profile> + <profile> <id>clover</id> <activation> <activeByDefault>false</activeByDefault>
