ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject git commit: revert AMBARI-5732
Date Thu, 15 May 2014 14:31:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.6.0 2a6d27615 -> 2a753b94d


revert AMBARI-5732


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a753b94
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a753b94
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a753b94

Branch: refs/heads/branch-1.6.0
Commit: 2a753b94dd7735e15f6d1ee08ee165ea4788b916
Parents: 2a6d276
Author: tbeerbower <tbeerbower@hortonworks.com>
Authored: Thu May 15 10:29:33 2014 -0400
Committer: tbeerbower <tbeerbower@hortonworks.com>
Committed: Thu May 15 10:30:21 2014 -0400

----------------------------------------------------------------------
 ambari-server/pom.xml       | 14 --------------
 contrib/views/files/pom.xml | 39 ---------------------------------------
 contrib/views/pig/pom.xml   | 39 ---------------------------------------
 pom.xml                     |  2 --
 4 files changed, 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2a753b94/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 884e04b..18cf077 100644
--- a/ambari-server/pom.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2a753b94/contrib/views/files/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml
index 9a817d2..811b24c 100644
--- a/contrib/views/files/pom.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2a753b94/contrib/views/pig/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index 389cf54..167fe32 100644
--- a/contrib/views/pig/pom.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2a753b94/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fac84e7..38d0aef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,7 +239,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>
@@ -250,7 +249,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>


Mime
View raw message