revert AMBARI-5732

ambari-server/pom.xml

@@ -245,20 +245,6 @@
                 </source>
               </sources>
             </mapping>
-            <!-- Put the contrib views in the view directory for deployment -->
-            <!--<mapping>-->
-              <!--<directory>/var/lib/ambari-server/resources/views</directory>-->
-              <!--<sources>-->
-                <!--<source>-->
-                  <!--<location>-->
-                    <!--${project.basedir}/../contrib/views/target-->
-                  <!--</location>-->
-                  <!--<includes>-->
-                    <!--<include>*.jar</include>-->
-                  <!--</includes>-->
-                <!--</source>-->
-              <!--</sources>-->
-            <!--</mapping>-->
             <mapping>
               <directory>${common_functions.install.dir}</directory>
               <sources>

contrib/views/files/pom.xml

@@ -285,43 +285,4 @@
         </plugins>
     </pluginManagement>
     </build>
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <!-- Copy only the contrib views that we want included for default deployment -->
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>2.6</version>
-            <executions>
-              <execution>
-                <id>copy-ambari-views</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <!-- View archives in ../target will be deployed with an Ambari server install -->
-                  <outputDirectory>${basedir}/../target</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>${basedir}/target/</directory>
-                      <includes>
-                        <include>*.jar</include>
-                      </includes>
-                      <filtering>true</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

contrib/views/pig/pom.xml

@@ -220,43 +220,4 @@
       </resource>
     </resources>
   </build>
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <!-- Copy only the contrib views that we want included for default deployment -->
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>2.6</version>
-            <executions>
-              <execution>
-                <id>copy-ambari-views</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <!-- View archives in ../target will be deployed with an Ambari server install -->
-                  <outputDirectory>${basedir}/../target</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>${basedir}/target/</directory>
-                      <includes>
-                        <include>*.jar</include>
-                      </includes>
-                      <filtering>true</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

pom.xml

@@ -253,7 +253,6 @@
         <module>ambari-web</module>
         <module>ambari-project</module>
         <module>ambari-views</module>
-        <!--<module>contrib/views/</module>-->
         <module>ambari-server</module>
         <module>ambari-agent</module>
         <module>ambari-client</module>
@@ -264,7 +263,6 @@
       <modules>
         <module>ambari-project</module>
         <module>ambari-views</module>
-        <!--<module>contrib/views/</module>-->
         <module>ambari-server</module>
         <module>ambari-agent</module>
         <module>ambari-client</module>