ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From crobe...@apache.org
Subject git commit: AMBARI-3567. Make provisions for ambari-web/public content to be read from a static location. (Trevor Mckay via croberts)
Date Mon, 06 Jan 2014 18:32:09 GMT
Updated Branches:
  refs/heads/trunk 8985c71dc -> f6379480d


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/f6379480
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f6379480
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f6379480

Branch: refs/heads/trunk
Commit: f6379480dfbb694f8ce5f7e145d7413081e6fe9b
Parents: 8985c71
Author: Chad Roberts <croberts@redhat.com>
Authored: Mon Jan 6 13:31:04 2014 -0500
Committer: Chad Roberts <croberts@redhat.com>
Committed: Mon Jan 6 13:31:21 2014 -0500

----------------------------------------------------------------------
 ambari-server/pom.xml |  3 ++-
 pom.xml               | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f6379480/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index c161486..212b944 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -30,6 +30,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <python.ver>python &gt;= 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>
@@ -203,7 +204,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/f6379480/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 36af3c1..3fd7555 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
     </pluginRepository>
   </pluginRepositories>
   <modules>
-    <module>ambari-web</module>
     <module>ambari-project</module>
     <module>ambari-server</module>
     <module>ambari-agent</module>
@@ -162,6 +161,18 @@
   </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>


Mime
View raw message