Updated Branches: refs/heads/trunk f6379480d -> f661509a4
Revert "AMBARI-3567. Make provisions for ambari-web/public content to be read from a static location. (Trevor Mckay via croberts)" This reverts commit f6379480dfbb694f8ce5f7e145d7413081e6fe9b. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f661509a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f661509a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f661509a Branch: refs/heads/trunk Commit: f661509a40a85a5850623e604762555a3fb0a63d Parents: f637948 Author: Yusaku Sako <[email protected]> Authored: Mon Jan 6 16:50:03 2014 -0800 Committer: Yusaku Sako <[email protected]> Committed: Mon Jan 6 16:50:03 2014 -0800 ---------------------------------------------------------------------- ambari-server/pom.xml | 3 +-- pom.xml | 13 +------------ 2 files changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f661509a/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/f661509a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3fd7555..36af3c1 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ </pluginRepository> </pluginRepositories> <modules> + <module>ambari-web</module> <module>ambari-project</module> <module>ambari-server</module> <module>ambari-agent</module> @@ -161,18 +162,6 @@ </build> <profiles> <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>ambari-web</module> - </modules> - </profile> - <profile> - <id>static-web</id> - </profile> - <profile> <id>clover</id> <activation> <activeByDefault>false</activeByDefault>
