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.

ambari-server/pom.xml

@@ -30,7 +30,6 @@
     <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>
@@ -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>

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>
@@ -160,18 +161,6 @@
     </plugins>
   </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>