You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2013/11/02 00:42:13 UTC

[12/13] git commit: FALCON-154 Remove webhcat startup in HadoopStartupListener as its not used. Contributed by Venkatesh Seetharam

FALCON-154 Remove webhcat startup in HadoopStartupListener as its not used. Contributed by Venkatesh Seetharam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/b7e1e6af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/b7e1e6af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/b7e1e6af

Branch: refs/heads/FALCON-85
Commit: b7e1e6af575c2e0dc25257e5c27693103ea8b77d
Parents: 6812bb3
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Fri Nov 1 13:21:32 2013 -0700
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Fri Nov 1 13:40:40 2013 -0700

----------------------------------------------------------------------
 hadoop-webapp/pom.xml                           |  5 ----
 .../falcon/listener/HadoopStartupListener.java  | 12 ----------
 pom.xml                                         | 24 --------------------
 3 files changed, 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b7e1e6af/hadoop-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-webapp/pom.xml b/hadoop-webapp/pom.xml
index c1da8fb..9770312 100644
--- a/hadoop-webapp/pom.xml
+++ b/hadoop-webapp/pom.xml
@@ -103,11 +103,6 @@
             <artifactId>hive-metastore</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.hcatalog</groupId>
-            <artifactId>webhcat</artifactId>
-        </dependency>
-
         <!-- Hive Metastore and WebHcat fails with out these dependencies -->
         <dependency>
             <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b7e1e6af/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
----------------------------------------------------------------------
diff --git a/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java b/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
index 570ba02..2d29b5e 100644
--- a/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
+++ b/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.hadoop.hive.metastore.HiveMetaStore;
 import org.apache.hadoop.mapred.JobConf;
-import org.apache.hcatalog.templeton.AppConfig;
 import org.apache.log4j.Logger;
 
 /**
@@ -62,7 +61,6 @@ public class HadoopStartupListener implements ServletContextListener {
             startBroker();
 
             startHiveMetaStore();
-            startHiveWebMetaStore();
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -156,16 +154,6 @@ public class HadoopStartupListener implements ServletContextListener {
         }
     }
 
-    public static final String WEB_HCAT_PORT = "48080";
-    private void startHiveWebMetaStore() {
-        String[] args = new String[]{
-            "-D" + AppConfig.PORT + "=" + WEB_HCAT_PORT,
-            "-D" + AppConfig.HADOOP_CONF_DIR + "=./target/webapps/hadoop/conf",
-        };
-
-        org.apache.hcatalog.templeton.Main.main(args);
-    }
-
     private Object instance(String clsName) throws Exception {
         return Class.forName(clsName).newInstance();
     }

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/b7e1e6af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 06d1a85..83c4758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -730,18 +730,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.hcatalog</groupId>
-                <artifactId>webhcat</artifactId>
-                <version>${hive.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-common</artifactId>
                 <version>${hive.version}</version>
@@ -768,18 +756,6 @@
 
             <dependency>
                 <groupId>org.apache.hcatalog</groupId>
-                <artifactId>webhcat</artifactId>
-                <version>${hcatalog.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.hcatalog</groupId>
                 <artifactId>webhcat-java-client</artifactId>
                 <version>${hcatalog.version}</version>
             </dependency>