瀏覽代碼

AMBARI-3567. Make provisions for ambari-web/public content to be read
from a static location. (croberts via Trevor McKay)

Chad Roberts 11 年之前
父節點
當前提交
25e74f9589
共有 2 個文件被更改,包括 26 次插入9 次删除
  1. 2 1
      ambari-server/pom.xml
  2. 24 8
      pom.xml

+ 2 - 1
ambari-server/pom.xml

@@ -27,6 +27,7 @@
     <python.ver>python &gt;= 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>

+ 24 - 8
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>
@@ -165,6 +157,30 @@
     </plugins>
   </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>