AMBARI-3567. Make provisions for ambari-web/public content to be read from a static location. (Trevor McKay via croberts)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/366a263c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/366a263c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/366a263c Branch: refs/heads/trunk Commit: 366a263c4a6d05d086d6c42b133debcf2384e843 Parents: a30ece3 Author: Chad Roberts <[email protected]> Authored: Wed Jan 8 09:35:30 2014 -0500 Committer: Chad Roberts <[email protected]> Committed: Wed Jan 8 09:35:30 2014 -0500 ---------------------------------------------------------------------- ambari-server/pom.xml | 3 +-- pom.xml | 29 +++++++---------------------- 2 files changed, 8 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/366a263c/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 212b944..c161486 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -30,7 +30,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <python.ver>python >= 2.6</python.ver> <hdpUrlForCentos6>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</hdpUrlForCentos6> - <ambari-web-dir>${basedir}/../ambari-web/public</ambari-web-dir> </properties> <build> <plugins> @@ -204,7 +203,7 @@ <directory>/usr/lib/ambari-server/web</directory> <sources> <source> - <location>${ambari-web-dir}</location> + <location>${basedir}/../ambari-web/public</location> <includes> <include>**</include> </includes> http://git-wip-us.apache.org/repos/asf/ambari/blob/366a263c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b8b147e..36af3c1 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,13 @@ <url>http://download.java.net/maven/glassfish/</url> </pluginRepository> </pluginRepositories> + <modules> + <module>ambari-web</module> + <module>ambari-project</module> + <module>ambari-server</module> + <module>ambari-agent</module> + <module>ambari-client</module> + </modules> <build> <pluginManagement> <plugins> @@ -155,28 +162,6 @@ </build> <profiles> <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>ambari-web</module> - <module>ambari-project</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-server</module> - <module>ambari-agent</module> - <module>ambari-client</module> - </modules> - </profile> - <profile> <id>clover</id> <activation> <activeByDefault>false</activeByDefault>
