diff --git a/.gitignore b/.gitignore
index 1e2a1f6c8..84f6d75b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,12 +16,11 @@ target
 
 # Oozie build
 core/pig*
-build
-mem
+core/hive-*
 core/build
 core/mem
 examples/oozietests
 mkdistro-*.out
 distro/downloads
 SecurityAuth.audit
-
+build
diff --git a/client/pom.xml b/client/pom.xml
index cffe29fe0..161eb3a4e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -57,6 +57,16 @@
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
index 8132e4c4a..84593ee64 100644
--- a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
+++ b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
@@ -1169,6 +1169,8 @@ private void validateCommand(CommandLine commandLine) throws OozieCLIException {
                 List<StreamSource> sources = new ArrayList<StreamSource>();
                 sources.add(new StreamSource(Thread.currentThread().getContextClassLoader().getResourceAsStream(
                         "oozie-workflow-0.1.xsd")));
+                sources.add(new StreamSource(Thread.currentThread().getContextClassLoader().getResourceAsStream(
+                        "hive-action-0.2.xsd")));
                 SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
                 Schema schema = factory.newSchema(sources.toArray(new StreamSource[sources.size()]));
                 Validator validator = schema.newValidator();
diff --git a/client/src/main/resources/hive-action-0.2.xsd b/client/src/main/resources/hive-action-0.2.xsd
new file mode 100644
index 000000000..dde95b99f
--- /dev/null
+++ b/client/src/main/resources/hive-action-0.2.xsd
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:hive="uri:oozie:hive-action:0.2" elementFormDefault="qualified"
+           targetNamespace="uri:oozie:hive-action:0.2">
+
+    <xs:element name="hive" type="hive:ACTION"/>
+
+    <xs:complexType name="ACTION">
+        <xs:sequence>
+            <xs:element name="job-tracker" type="xs:string" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="name-node" type="xs:string" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="prepare" type="hive:PREPARE" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="job-xml" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="configuration" type="hive:CONFIGURATION" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="script" type="xs:string" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="file" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="archive" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="CONFIGURATION">
+        <xs:sequence>
+            <xs:element name="property" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="name" minOccurs="1" maxOccurs="1" type="xs:string"/>
+                        <xs:element name="value" minOccurs="1" maxOccurs="1" type="xs:string"/>
+                        <xs:element name="description" minOccurs="0" maxOccurs="1" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="PREPARE">
+        <xs:sequence>
+            <xs:element name="delete" type="hive:DELETE" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="mkdir" type="hive:MKDIR" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="DELETE">
+        <xs:attribute name="path" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="MKDIR">
+        <xs:attribute name="path" type="xs:string" use="required"/>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/core/pom.xml b/core/pom.xml
index 661fce131..ddc03895d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -60,7 +60,18 @@
         <dependency>
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
 
         <dependency>
@@ -76,14 +87,12 @@
         </dependency>
 
         <dependency>
-            <!-- groupId to be correct by GH-0226 -->
-            <groupId>com.yahoo.hadoop</groupId>
+            <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <!-- groupId to be correct by GH-0226 -->
-            <groupId>com.yahoo.hadoop</groupId>
+            <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-test</artifactId>
             <scope>test</scope>
         </dependency>
@@ -92,6 +101,12 @@
             <groupId>com.yahoo.oozie</groupId>
             <artifactId>oozie-sharelib</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-enhancer</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/core/src/main/conf/oozie-site.xml b/core/src/main/conf/oozie-site.xml
index c0544376a..5bd835830 100644
--- a/core/src/main/conf/oozie-site.xml
+++ b/core/src/main/conf/oozie-site.xml
@@ -16,6 +16,22 @@
 
 <configuration>
 
+    <!-- Uncomment the following  properties to enable Hive actions
+
+    <property>
+        <name>oozie.service.ActionService.executor.ext.classes</name>
+        <value>
+            org.apache.oozie.action.hadoop.HiveActionExecutor
+        </value>
+    </property>
+
+    <property>
+        <name>oozie.service.SchemaService.wf.ext.schemas</name>
+        <value>hive-action-0.2.xsd</value>
+    </property>
+
+    -->
+
 <!--
     Refer to the oozie-default.xml file for the complete list of
     Oozie configuration properties and their default values.
diff --git a/core/src/main/java/org/apache/oozie/ErrorCode.java b/core/src/main/java/org/apache/oozie/ErrorCode.java
index e04197030..6967b426d 100644
--- a/core/src/main/java/org/apache/oozie/ErrorCode.java
+++ b/core/src/main/java/org/apache/oozie/ErrorCode.java
@@ -146,6 +146,8 @@ public enum ErrorCode {
     E0900(XLog.OPS, "Jobtracker [{0}] not allowed, not in Oozie's whitelist"),
     E0901(XLog.OPS, "Namenode [{0}] not allowed, not in Oozie's whitelist"),
     E0902(XLog.OPS, "Exception occured: [{0}]"),
+    E0903(XLog.OPS, "Configuration does not have Jobtracker Kerberos name or rule"),
+    E0904(XLog.OPS, "Configuration does not have Namenode Kerberos name or rule"),
 
     E1001(XLog.STD, "Could not read the coordinator job definition, {0}"),
     E1002(XLog.STD, "Invalid coordinator application URI [{0}], {1}"),
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
index f6eee7716..dbb7ac080 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
@@ -121,7 +121,7 @@ private FileSystem getFileSystemFor(Path path, Context context) throws HadoopAcc
         String user = context.getWorkflow().getUser();
         String group = context.getWorkflow().getGroup();
         return Services.get().get(HadoopAccessorService.class).createFileSystem(user, group, path.toUri(),
-                new Configuration());
+                context.getProtoActionConf());
     }
 
     /**
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
new file mode 100644
index 000000000..8f027ded1
--- /dev/null
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/HiveActionExecutor.java
@@ -0,0 +1,125 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.oozie.action.hadoop;
+
+import static org.apache.oozie.action.hadoop.LauncherMapper.CONF_OOZIE_ACTION_MAIN_CLASS;
+
+import java.io.StringReader;
+import java.util.List;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.oozie.action.ActionExecutorException;
+import org.apache.oozie.client.WorkflowAction;
+import org.apache.oozie.util.XConfiguration;
+import org.apache.oozie.util.XmlUtils;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.Namespace;
+
+public class HiveActionExecutor extends JavaActionExecutor {
+    private static final String OOZIE_HIVE_DEFAULTS = "oozie.hive.defaults";
+
+    public HiveActionExecutor() {
+        super("hive");
+    }
+
+    @Override
+    protected List<Class> getLauncherClasses() {
+        List<Class> classes = super.getLauncherClasses();
+        classes.add(LauncherMain.class);
+        classes.add(MapReduceMain.class);
+        classes.add(HiveMain.class);
+        return classes;
+    }
+
+    @Override
+    protected String getLauncherMain(Configuration launcherConf, Element actionXml) {
+        return launcherConf.get(CONF_OOZIE_ACTION_MAIN_CLASS, HiveMain.class.getName());
+    }
+
+    public Configuration setupHiveDefault(Configuration conf, Path appPath, Element actionXml)
+            throws ActionExecutorException {
+        try {
+            //Setting up hive-default.xml file if specified by the Hive action
+            Element actionConf = actionXml.getChild("configuration", actionXml.getNamespace());
+            if (actionConf != null) {
+                String strConf = XmlUtils.prettyPrint(actionConf).toString();
+                XConfiguration inlineConf = new XConfiguration(new StringReader(strConf));
+                if (inlineConf.get(OOZIE_HIVE_DEFAULTS) != null) {
+                    Path hiveDefaults = new Path(inlineConf.get(OOZIE_HIVE_DEFAULTS));
+                    // hive-default.xml will be softlinked to the working dir which is in the launcher CP.
+                    // the softlink is done as 'oozie-user-hive-default.xml' and Oozie HiveMain class will
+                    // check if the Hive being used has a hive-default.xml or not, if not it will rename
+                    // it as hive-default.xml before invoking hive
+                    addToCache(conf, appPath, hiveDefaults + "#" + HiveMain.USER_HIVE_DEFAULT_FILE, false);
+                }
+            }
+            return conf;
+        }
+        catch (Exception ex) {
+            throw convertException(ex);
+        }
+    }
+
+    @Override
+    protected Configuration setupLauncherConf(Configuration conf, Element actionXml, Path appPath, Context context)
+            throws ActionExecutorException {
+        try {
+            super.setupLauncherConf(conf, actionXml, appPath, context);
+            Namespace ns = actionXml.getNamespace();
+
+            setupHiveDefault(conf, appPath, actionXml);
+
+            String script = actionXml.getChild("script", ns).getTextTrim();
+            String scriptName = new Path(script).getName();
+            addToCache(conf, appPath, script + "#" + scriptName, false);
+            return conf;
+        }
+        catch (Exception ex) {
+            throw convertException(ex);
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    Configuration setupActionConf(Configuration actionConf, Context context, Element actionXml,
+                                  Path appPath) throws ActionExecutorException {
+        Configuration conf = super.setupActionConf(actionConf, context, actionXml, appPath);
+
+        Namespace ns = actionXml.getNamespace();
+        String script = actionXml.getChild("script", ns).getTextTrim();
+        String scriptName = new Path(script).getName();
+        addToCache(conf, appPath, script + "#" + scriptName, false);
+
+        List<Element> params = (List<Element>) actionXml.getChildren("param", ns);
+        String[] strParams = new String[params.size()];
+        for (int i = 0; i < params.size(); i++) {
+            strParams[i] = params.get(i).getTextTrim();
+        }
+
+        HiveMain.setHiveScript(conf, scriptName, strParams);
+        return conf;
+    }
+
+    @Override
+    protected boolean getCaptureOutput(WorkflowAction action) throws JDOMException {
+        return true;
+    }
+
+}
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java b/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
new file mode 100644
index 000000000..0fc02db84
--- /dev/null
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
@@ -0,0 +1,368 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.oozie.action.hadoop;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.cli.CliDriver;
+
+public class HiveMain extends LauncherMain {
+    public static final String USER_HIVE_DEFAULT_FILE = "oozie-user-hive-default.xml";
+
+    public static final String HIVE_L4J_PROPS = "hive-log4j.properties";
+    public static final String HIVE_EXEC_L4J_PROPS = "hive-exec-log4j.properties";
+    public static final String HIVE_SITE_CONF = "hive-site.xml";
+    private static final String HIVE_SCRIPT = "oozie.hive.script";
+    private static final String HIVE_PARAMS = "oozie.hive.params";
+
+    public static void main(String[] args) throws Exception {
+        run(HiveMain.class, args);
+    }
+
+    private static Configuration initActionConf() {
+        // Loading action conf prepared by Oozie
+        Configuration hiveConf = new Configuration(false);
+
+        String actionXml = System.getProperty("oozie.action.conf.xml");
+
+        if (actionXml == null) {
+            throw new RuntimeException("Missing Java System Property [oozie.action.conf.xml]");
+        }
+        if (!new File(actionXml).exists()) {
+            throw new RuntimeException("Action Configuration XML file [" + actionXml + "] does not exist");
+        } else {
+            System.out.println("Using action configuration file " + actionXml);
+        }
+
+        hiveConf.addResource(new Path("file:///", actionXml));
+
+        // Propagate delegation related props from launcher job to Hive job
+        String delegationToken = System.getenv("HADOOP_TOKEN_FILE_LOCATION");
+        if (delegationToken != null) {
+            hiveConf.set("mapreduce.job.credentials.binary", delegationToken);
+            System.out.println("------------------------");
+            System.out.println("Setting env property for mapreduce.job.credentials.binary to: " + delegationToken);
+            System.out.println("------------------------");
+            System.setProperty("mapreduce.job.credentials.binary", delegationToken);
+        } else {
+            System.out.println("Non-Kerberos execution");
+        }
+
+        // Have to explicitly unset this property or Hive will not set it.
+        hiveConf.set("mapred.job.name", "");
+
+        // See https://issues.apache.org/jira/browse/HIVE-1411
+        hiveConf.set("datanucleus.plugin.pluginRegistryBundleCheck", "LOG");
+
+        // to force hive to use the jobclient to submit the job, never using HADOOPBIN (to do localmode)
+        hiveConf.setBoolean("hive.exec.mode.local.auto", false);
+
+        return hiveConf;
+    }
+
+    public static String setUpHiveLog4J(Configuration hiveConf) throws IOException {
+        //Logfile to capture job IDs
+        String hadoopJobId = System.getProperty("oozie.launcher.job.id");
+        if (hadoopJobId == null) {
+            throw new RuntimeException("Launcher Hadoop Job ID system property not set");
+        }
+
+        String logFile = new File("hive-oozie-" + hadoopJobId + ".log").getAbsolutePath();
+
+        Properties hadoopProps = new Properties();
+
+        // Preparing log4j configuration
+        URL log4jFile = Thread.currentThread().getContextClassLoader().getResource("log4j.properties");
+        if (log4jFile != null) {
+            // getting hadoop log4j configuration
+            hadoopProps.load(log4jFile.openStream());
+        }
+
+        String logLevel = hiveConf.get("oozie.hive.log.level", "INFO");
+
+        hadoopProps.setProperty("log4j.logger.org.apache.hadoop.hive", logLevel + ", A");
+        hadoopProps.setProperty("log4j.logger.hive", logLevel + ", A");
+        hadoopProps.setProperty("log4j.logger.DataNucleus", logLevel + ", A");
+        hadoopProps.setProperty("log4j.logger.DataStore", logLevel + ", A");
+        hadoopProps.setProperty("log4j.logger.JPOX", logLevel + ", A");
+        hadoopProps.setProperty("log4j.appender.A", "org.apache.log4j.ConsoleAppender");
+        hadoopProps.setProperty("log4j.appender.A.layout", "org.apache.log4j.PatternLayout");
+        hadoopProps.setProperty("log4j.appender.A.layout.ConversionPattern", "%-4r [%t] %-5p %c %x - %m%n");
+
+        hadoopProps.setProperty("log4j.appender.jobid", "org.apache.log4j.FileAppender");
+        hadoopProps.setProperty("log4j.appender.jobid.file", logFile);
+        hadoopProps.setProperty("log4j.appender.jobid.layout", "org.apache.log4j.PatternLayout");
+        hadoopProps.setProperty("log4j.appender.jobid.layout.ConversionPattern", "%-4r [%t] %-5p %c %x - %m%n");
+        hadoopProps.setProperty("log4j.logger.org.apache.hadoop.hive.ql.exec", "INFO, jobid");
+
+        String localProps = new File(HIVE_L4J_PROPS).getAbsolutePath();
+        OutputStream os1 = new FileOutputStream(localProps);
+        hadoopProps.store(os1, "");
+        os1.close();
+
+        localProps = new File(HIVE_EXEC_L4J_PROPS).getAbsolutePath();
+        os1 = new FileOutputStream(localProps);
+        hadoopProps.store(os1, "");
+        os1.close();
+        return logFile;
+    }
+
+    public static Configuration setUpHiveSite() throws Exception {
+        Configuration hiveConf = initActionConf();
+
+        // Write the action configuration out to hive-site.xml
+        OutputStream os = new FileOutputStream(HIVE_SITE_CONF);
+        hiveConf.writeXml(os);
+        os.close();
+
+        System.out.println();
+        System.out.println("Hive Configuration Properties:");
+        System.out.println("------------------------");
+        for (Entry<String, String> entry : hiveConf) {
+            System.out.println(entry.getKey() + "=" + entry.getValue());
+        }
+        System.out.flush();
+        System.out.println("------------------------");
+        System.out.println();
+        return hiveConf;
+    }
+
+    protected void run(String[] args) throws Exception {
+        if (System.getenv("HADOOP_HOME") == null) {
+            throw new RuntimeException("'HADOOP_HOME' environment variable undefined, Hive cannot run");
+        }
+        System.out.println();
+        System.out.println("Oozie Hive action configuration");
+        System.out.println("=================================================================");
+
+        Configuration hiveConf = setUpHiveSite();
+
+        List<String> arguments = new ArrayList<String>();
+        String scriptPath = hiveConf.get(HIVE_SCRIPT);
+
+        if (scriptPath == null) {
+            throw new RuntimeException("Action Configuration does not have [oozie.hive.script] property");
+        }
+
+        if (!new File(scriptPath).exists()) {
+            throw new RuntimeException("Hive script file [" + scriptPath + "] does not exist");
+        }
+
+        // check if hive-default.xml is in the classpath, if not look for oozie-hive-default.xml
+        // in the current directory (it will be there if the Hive action has the 'oozie.hive.defaults'
+        // property) and rename it to hive-default.xml
+        if (Thread.currentThread().getContextClassLoader().getResource("hive-default.xml") == null) {
+            File userProvidedDefault = new File(USER_HIVE_DEFAULT_FILE);
+            if (userProvidedDefault.exists()) {
+                if (!userProvidedDefault.renameTo(new File("hive-default.xml"))) {
+                    throw new RuntimeException(
+                            "Could not rename user provided Hive defaults file to 'hive-default.xml'");
+                }
+                System.out.println("Using 'hive-default.xml' defined in the Hive action");
+            }
+            else {
+                throw new RuntimeException(
+                        "Hive JAR does not bundle a 'hive-default.xml' and Hive action does not define one");
+            }
+        }
+        else {
+            System.out.println("Using 'hive-default.xml' defined in the Hive JAR");
+            File userProvidedDefault = new File(USER_HIVE_DEFAULT_FILE);
+            if (userProvidedDefault.exists()) {
+                System.out.println("WARNING: Ignoring user provided Hive defaults");
+            }
+        }
+        System.out.println();
+
+        String logFile = setUpHiveLog4J(hiveConf);
+
+        // print out current directory & its contents
+        File localDir = new File("dummy").getAbsoluteFile().getParentFile();
+        System.out.println("Current (local) dir = " + localDir.getAbsolutePath());
+        System.out.println("------------------------");
+        for (String file : localDir.list()) {
+            System.out.println("  " + file);
+        }
+        System.out.println("------------------------");
+        System.out.println();
+
+        // Prepare the Hive Script
+        String script = readStringFromFile(scriptPath);
+        System.out.println();
+        System.out.println("Original script [" + scriptPath + "] content: ");
+        System.out.println("------------------------");
+        System.out.println(script);
+        System.out.println("------------------------");
+        System.out.println();
+
+        String[] params = MapReduceMain.getStrings(hiveConf, HIVE_PARAMS);
+        if (params.length > 0) {
+            Map<String, String> varMap = new HashMap<String, String>();
+            System.out.println("Parameters:");
+            System.out.println("------------------------");
+            for (String param : params) {
+                System.out.println("  " + param);
+
+                int idx = param.indexOf('=');
+                if (idx == -1) {
+                    throw new RuntimeException("Parameter expression must contain an assignment: " + param);
+                } else if (idx == 0) {
+                    throw new RuntimeException("Parameter value not specified: " + param);
+                }
+                String var = param.substring(0, idx);
+                String val = param.substring(idx + 1, param.length());
+                varMap.put(var, val);
+            }
+            System.out.println("------------------------");
+            System.out.println();
+
+            String resolvedScript = substitute(varMap, script);
+            scriptPath = scriptPath + ".sub";
+            writeStringToFile(scriptPath, resolvedScript);
+
+            System.out.println("Resolved script [" + scriptPath + "] content: ");
+            System.out.println("------------------------");
+            System.out.println(resolvedScript);
+            System.out.println("------------------------");
+            System.out.println();
+        }
+
+        arguments.add("-f");
+        arguments.add(scriptPath);
+
+
+        System.out.println("Hive command arguments :");
+        for (String arg : arguments) {
+            System.out.println("             " + arg);
+        }
+        System.out.println();
+
+        System.out.println("=================================================================");
+        System.out.println();
+        System.out.println(">>> Invoking Hive command line now >>>");
+        System.out.println();
+        System.out.flush();
+
+        try {
+            runHive(arguments.toArray(new String[arguments.size()]));
+        }
+        catch (SecurityException ex) {
+            if (LauncherSecurityManager.getExitInvoked()) {
+                if (LauncherSecurityManager.getExitCode() != 0) {
+                    throw ex;
+                }
+            }
+        }
+
+        System.out.println("\n<<< Invocation of Hive command completed <<<\n");
+
+        // harvesting and recording Hadoop Job IDs
+        Properties jobIds = getHadoopJobIds(logFile, JOB_ID_LOG_PREFIX);
+        File file = new File(System.getProperty("oozie.action.output.properties"));
+        OutputStream os = new FileOutputStream(file);
+        jobIds.store(os, "");
+        os.close();
+        System.out.println(" Hadoop Job IDs executed by Hive: " + jobIds.getProperty("hadoopJobs"));
+        System.out.println();
+    }
+
+    private void runHive(String[] args) throws Exception {
+        CliDriver.main(args);
+    }
+
+    public static void setHiveScript(Configuration conf, String script, String[] params) {
+        conf.set(HIVE_SCRIPT, script);
+        MapReduceMain.setStrings(conf, HIVE_PARAMS, params);
+    }
+
+    private static String readStringFromFile(String filePath) throws IOException {
+        String line;
+        BufferedReader br = new BufferedReader(new FileReader(filePath));
+        StringBuilder sb = new StringBuilder();
+        String sep = System.getProperty("line.separator");
+        while ((line = br.readLine()) != null) {
+            sb.append(line).append(sep);
+        }
+        return sb.toString();
+     }
+
+    private static void writeStringToFile(String filePath, String str) throws IOException {
+        BufferedWriter out = new BufferedWriter(new FileWriter(filePath));
+        out.write(str);
+        out.close();
+    }
+
+    static String substitute(Map<String, String> vars, String expr) {
+        for (Map.Entry<String, String> entry : vars.entrySet()) {
+            String var = "${" + entry.getKey() + "}";
+            String value = entry.getValue();
+            expr = expr.replace(var, value);
+        }
+        return expr;
+    }
+
+    //TODO: Hive should provide a programmatic way of spitting out Hadoop jobs
+    private static final String JOB_ID_LOG_PREFIX = "Ended Job = ";
+
+    public static Properties getHadoopJobIds(String logFile, String prefix) throws IOException {
+        Properties props = new Properties();
+        StringBuffer sb = new StringBuffer(100);
+        if (!new File(logFile).exists()) {
+            System.err.println("hive log file: " + logFile + "  not present. Therefore no Hadoop jobids found");
+            props.setProperty("hadoopJobs", "");
+        }
+        else {
+            BufferedReader br = new BufferedReader(new FileReader(logFile));
+            String line = br.readLine();
+            String separator = "";
+            while (line != null) {
+                if (line.contains(prefix)) {
+                    int jobIdStarts = line.indexOf(prefix) + prefix.length();
+                    String jobId = line.substring(jobIdStarts).trim();
+
+                    //Doing this because Hive now does things like ConditionalTask which are not Hadoop jobs.
+                    if (jobId.startsWith("job_")) {
+                        sb.append(separator).append(jobId);
+                        separator = ",";
+                    }
+                }
+                line = br.readLine();
+            }
+            br.close();
+            props.setProperty("hadoopJobs", sb.toString());
+        }
+        return props;
+    }
+
+}
diff --git a/core/src/main/java/org/apache/oozie/command/wf/SubmitCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SubmitCommand.java
index 621ba9f14..2b3e30f38 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/SubmitCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/SubmitCommand.java
@@ -112,7 +112,8 @@ protected String call(WorkflowStore store) throws StoreException, CommandExcepti
             String user = conf.get(OozieClient.USER_NAME);
             String group = conf.get(OozieClient.GROUP_NAME);
             FileSystem fs = Services.get().get(HadoopAccessorService.class).createFileSystem(user, group,
-                                                                                             configDefault.toUri(), new Configuration());
+                                                                                             configDefault.toUri(),
+                                                                                             conf);
 
             if (fs.exists(configDefault)) {
                 try {
diff --git a/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java b/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java
index 0dd321f4a..33482214f 100644
--- a/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java
+++ b/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java
@@ -126,6 +126,7 @@ public JobClient createJobClient(String user, String group, final JobConf conf)
             UserGroupInformation ugi = getUGI(user);
             JobClient jobClient = ugi.doAs(new PrivilegedExceptionAction<JobClient>() {
                 public JobClient run() throws Exception {
+                    validateConf(conf);
                     return new JobClient(conf);
                 }
             });
@@ -159,6 +160,7 @@ public FileSystem createFileSystem(String user, String group, final Configuratio
                 public FileSystem run() throws Exception {
                     Configuration defaultConf = new Configuration();
                     XConfiguration.copy(conf, defaultConf);
+                    validateConf(conf);
                     return FileSystem.get(defaultConf);
                 }
             });
@@ -197,6 +199,7 @@ public FileSystem run() throws Exception {
                     defaultConf.set(WorkflowAppService.HADOOP_NN_KERBEROS_NAME, "hdfs/_HOST@" + localRealm);
 
                     XConfiguration.copy(conf, defaultConf);
+                    validateConf(conf);
                     return FileSystem.get(uri, defaultConf);
                 }
             });
@@ -223,6 +226,7 @@ public Void run() throws Exception {
                     //Doing this NOP add first to have the FS created and cached
                     DistributedCache.addFileToClassPath(file, defaultConf);
 
+                    validateConf(conf);
                     DistributedCache.addFileToClassPath(file, conf);
                     return null;
                 }
@@ -235,4 +239,13 @@ public Void run() throws Exception {
 
     }
 
+    private void validateConf(Configuration conf) throws HadoopAccessorException {
+        if (conf.get(WorkflowAppService.HADOOP_JT_KERBEROS_NAME) == null) {
+            throw new HadoopAccessorException(ErrorCode.E0903);
+        }
+        if (conf.get(WorkflowAppService.HADOOP_NN_KERBEROS_NAME) == null) {
+            throw new HadoopAccessorException(ErrorCode.E0904);
+        }
+    }
+
 }
diff --git a/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java b/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
index 4fd2a0d91..7c2103cb6 100644
--- a/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
+++ b/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
@@ -37,7 +37,7 @@ public WorkflowApp parseDef(Configuration jobConf, String authToken) throws Work
         String appPath = ParamChecker.notEmpty(jobConf.get(OozieClient.APP_PATH), OozieClient.APP_PATH);
         String user = ParamChecker.notEmpty(jobConf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
         String group = ParamChecker.notEmpty(jobConf.get(OozieClient.GROUP_NAME), OozieClient.GROUP_NAME);
-        String workflowXml = readDefinition(appPath, user, group, authToken);
+        String workflowXml = readDefinition(appPath, user, group, authToken, jobConf);
         return parseDef(workflowXml);
     }
 
diff --git a/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java b/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
index 55146eb5d..b6b4fee6a 100644
--- a/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
+++ b/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
@@ -95,12 +95,11 @@ public Class<? extends Service> getInterface() {
      * @return workflow definition.
      * @throws WorkflowException thrown if the definition could not be read.
      */
-    protected String readDefinition(String appPath, String user, String group, String autToken)
+    protected String readDefinition(String appPath, String user, String group, String autToken, Configuration conf)
             throws WorkflowException {
         try {
             URI uri = new URI(appPath);
-            FileSystem fs = Services.get().get(HadoopAccessorService.class).
-                    createFileSystem(user, group, uri, new Configuration());
+            FileSystem fs = Services.get().get(HadoopAccessorService.class).createFileSystem(user, group, uri, conf);
             Reader reader = new InputStreamReader(fs.open(new Path(uri.getPath())));
             StringWriter writer = new StringWriter();
             IOUtils.copyCharStream(reader, writer);
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
new file mode 100644
index 000000000..e1283483a
--- /dev/null
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
@@ -0,0 +1,280 @@
+package org.apache.oozie.action.hadoop;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringReader;
+import java.io.Writer;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.jdo.Query;
+
+
+import org.antlr.runtime.ANTLRFileStream;
+import org.apache.commons.collections.Bag;
+import org.apache.commons.lang.text.StrMatcher;
+import org.apache.derby.iapi.services.io.DerbyIOException;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.cli.CliSessionState;
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.contrib.serde2.RegexSerDe;
+import org.apache.hadoop.hive.metastore.HiveMetaStore;
+import org.apache.hadoop.hive.ql.exec.ExecDriver;
+import org.apache.hadoop.hive.serde2.SerDe;
+import org.apache.hadoop.hive.service.HiveServer;
+import org.apache.hadoop.hive.shims.Hadoop20Shims;
+import org.apache.hadoop.mapred.JobClient;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.JobID;
+import org.apache.hadoop.mapred.RunningJob;
+import org.apache.oozie.WorkflowActionBean;
+import org.apache.oozie.WorkflowJobBean;
+import org.apache.oozie.client.OozieClient;
+import org.apache.oozie.client.WorkflowAction;
+import org.apache.oozie.service.HadoopAccessorService;
+import org.apache.oozie.service.Services;
+import org.apache.oozie.service.WorkflowAppService;
+import org.apache.oozie.util.ClassUtils;
+import org.apache.oozie.util.IOUtils;
+import org.apache.oozie.util.XConfiguration;
+import org.apache.oozie.util.XmlUtils;
+import org.apache.thrift.TBase;
+import org.apache.velocity.app.VelocityEngine;
+import org.datanucleus.FetchGroup;
+import org.datanucleus.store.rdbms.RDBMSStoreManager;
+import org.jdom.Element;
+import org.jdom.Namespace;
+import org.json.JSONML;
+import org.objectweb.asm.ByteVector;
+
+import com.facebook.fb303.FacebookBase;
+
+public class TestHiveActionExecutor extends ActionExecutorTestCase {
+
+    private static final String NEW_LINE =
+        System.getProperty("line.separator", "\n");
+
+    private static final String SAMPLE_DATA_TEXT =
+        "3\n4\n6\n1\n2\n7\n9\n0\n8\n";
+
+    private static final String HIVE_SCRIPT_FILENAME = "script.q";
+
+    private static final String INPUT_DIRNAME = "input";
+    private static final String OUTPUT_DIRNAME = "output";
+    private static final String DATA_FILENAME = "data.txt";
+
+    protected void setSystemProps() {
+        super.setSystemProps();
+        setSystemProperty("oozie.service.ActionService.executor.classes",
+                HiveActionExecutor.class.getName());
+    }
+
+    public void testVariableSubstitutionSimple() throws Exception {
+        String key = "test.random.key";
+        String keyExpression = "${" + key + "}";
+        Map<String, String> varMap = new HashMap<String, String>();
+        varMap.put(key, keyExpression);
+        String value = HiveMain.substitute(varMap, keyExpression);
+        assertTrue("Unexpected value " + value, value.equals(keyExpression));
+    }
+
+    public void testSetupMethods() throws Exception {
+        HiveActionExecutor ae = new HiveActionExecutor();
+        assertEquals("hive", ae.getType());
+    }
+
+    public void testLauncherJar() throws Exception {
+        HiveActionExecutor ae = new HiveActionExecutor();
+        Path jar = new Path(ae.getOozieRuntimeDir(), ae.getLauncherJarName());
+        assertTrue(new File(jar.toString()).exists());
+    }
+
+    private String getHiveScript(String inputPath, String outputPath) {
+        StringBuilder buffer = new StringBuilder(NEW_LINE);
+        buffer.append("set -v;").append(NEW_LINE);
+        buffer.append("CREATE EXTERNAL TABLE test (a INT) STORED AS");
+        buffer.append(NEW_LINE).append("TEXTFILE LOCATION '");
+        buffer.append(inputPath).append("';").append(NEW_LINE);
+        buffer.append("INSERT OVERWRITE DIRECTORY '");
+        buffer.append(outputPath).append("'").append(NEW_LINE);
+        buffer.append("SELECT (a-1) FROM test;").append(NEW_LINE);
+
+        return buffer.toString();
+    }
+
+    private String getActionXml() {
+        String script = "<hive xmlns=''uri:oozie:hive-action:0.2''>" +
+        "<job-tracker>{0}</job-tracker>" +
+        "<name-node>{1}</name-node>" +
+        "<configuration>" +
+        "<property>" +
+        "<name>javax.jdo.option.ConnectionURL</name>" +
+        "<value>jdbc:hsqldb:mem:hive-main;create=true</value>" +
+        "</property>" +
+        "<property>" +
+        "<name>javax.jdo.option.ConnectionDriverName</name>" +
+        "<value>org.hsqldb.jdbcDriver</value>" +
+        "</property>" +
+        "<property>" +
+        "<name>javax.jdo.option.ConnectionUserName</name>" +
+        "<value>sa</value>" +
+        "</property>" +
+        "<property>" +
+        "<name>javax.jdo.option.ConnectionPassword</name>" +
+        "<value> </value>" +
+        "</property>" +
+        "<property>" +
+        "<name>oozie.hive.defaults</name>" +
+        "<value>user-hive-default.xml</value>" +
+        "</property>" +
+        "</configuration>" +
+        "<script>" + HIVE_SCRIPT_FILENAME + "</script>" +
+        "</hive>";
+        return MessageFormat.format(script, getJobTrackerUri(), getNameNodeUri());
+    }
+
+    public void testHiveAction() throws Exception {
+        Path inputDir = new Path(getFsTestCaseDir(), INPUT_DIRNAME);
+        Path outputDir = new Path(getFsTestCaseDir(), OUTPUT_DIRNAME);
+
+        FileSystem fs = getFileSystem();
+        Path script = new Path(getAppPath(), HIVE_SCRIPT_FILENAME);
+        Writer scriptWriter = new OutputStreamWriter(fs.create(script));
+        scriptWriter.write(getHiveScript(inputDir.toString(), outputDir.toString()));
+        scriptWriter.close();
+
+        Writer dataWriter = new OutputStreamWriter(fs.create(new Path(inputDir, DATA_FILENAME)));
+        dataWriter.write(SAMPLE_DATA_TEXT);
+        dataWriter.close();
+
+        InputStream is = IOUtils.getResourceAsStream("user-hive-default.xml", -1);
+        OutputStream os = fs.create(new Path(getAppPath(), "user-hive-default.xml"));
+        IOUtils.copyStream(is, os);
+
+        Context context = createContext(getActionXml());
+        final RunningJob launcherJob = submitAction(context);
+        String launcherId = context.getAction().getExternalId();
+        waitFor(200 * 1000, new Predicate() {
+            public boolean evaluate() throws Exception {
+                return launcherJob.isComplete();
+            }
+        });
+        assertTrue(launcherJob.isSuccessful());
+
+        assertFalse(LauncherMapper.hasIdSwap(launcherJob));
+
+        HiveActionExecutor ae = new HiveActionExecutor();
+        ae.check(context, context.getAction());
+        assertTrue(launcherId.equals(context.getAction().getExternalId()));
+        assertEquals("SUCCEEDED", context.getAction().getExternalStatus());
+        assertNotNull(context.getAction().getData());
+        ae.end(context, context.getAction());
+        assertEquals(WorkflowAction.Status.OK, context.getAction().getStatus());
+
+        assertNotNull(context.getAction().getData());
+        Properties outputData = new Properties();
+        outputData.load(new StringReader(context.getAction().getData()));
+        assertTrue(outputData.containsKey("hadoopJobs"));
+        assertTrue(outputData.getProperty("hadoopJobs").trim().length() > 0);
+
+        assertTrue(fs.exists(outputDir));
+        assertTrue(fs.isDirectory(outputDir));
+    }
+
+    private RunningJob submitAction(Context context) throws Exception {
+        HiveActionExecutor ae = new HiveActionExecutor();
+
+        WorkflowAction action = context.getAction();
+
+        ae.prepareActionDir(getFileSystem(), context);
+        ae.submitLauncher(context, action);
+
+        String jobId = action.getExternalId();
+        String jobTracker = action.getTrackerUri();
+        String consoleUrl = action.getConsoleUrl();
+        assertNotNull(jobId);
+        assertNotNull(jobTracker);
+        assertNotNull(consoleUrl);
+        Element e = XmlUtils.parseXml(action.getConf());
+        Namespace ns = Namespace.getNamespace("uri:oozie:hive-action:0.2");
+        XConfiguration conf =
+                new XConfiguration(new StringReader(XmlUtils.prettyPrint(e.getChild("configuration", ns)).toString()));
+        conf.set("mapred.job.tracker", e.getChildTextTrim("job-tracker", ns));
+        conf.set("fs.default.name", e.getChildTextTrim("name-node", ns));
+        conf.set("user.name", context.getProtoActionConf().get("user.name"));
+        conf.set("group.name", getTestGroup());
+        injectKerberosInfo(conf);
+        JobConf jobConf = new JobConf(conf);
+        String user = jobConf.get("user.name");
+        String group = jobConf.get("group.name");
+        JobClient jobClient = Services.get().get(HadoopAccessorService.class).createJobClient(user, group, jobConf);
+        final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
+        assertNotNull(runningJob);
+        return runningJob;
+    }
+
+    private String copyJar(String targetFile, Class<?> anyContainedClass)
+            throws Exception {
+        String file = ClassUtils.findContainingJar(anyContainedClass);
+        System.out.println("[copy-jar] class: " + anyContainedClass
+                + ", local jar ==> " + file);
+        Path targetPath = new Path(getAppPath(), targetFile);
+        FileSystem fs = getFileSystem();
+        InputStream is = new FileInputStream(file);
+        OutputStream os = fs.create(new Path(getAppPath(), targetPath));
+        IOUtils.copyStream(is, os);
+        return targetPath.toString();
+    }
+
+    private Context createContext(String actionXml) throws Exception {
+        List<String> jars = new ArrayList<String>();
+        HiveActionExecutor ae = new HiveActionExecutor();
+
+        jars.add(copyJar("lib/libfb303-x.jar", FacebookBase.class));
+        jars.add(copyJar("lib/libthrift-x.jar", TBase.class));
+        jars.add(copyJar("lib/libjson-x.jar", JSONML.class));
+        jars.add(copyJar("lib/jdo2-api-x.jar", Query.class));
+        jars.add(copyJar("lib/antlr-runtime-x.jar", ANTLRFileStream.class));
+        jars.add(copyJar("lib/asm-x.jar", ByteVector.class));
+        jars.add(copyJar("lib/commons-collection-x.jar", Bag.class));
+        jars.add(copyJar("lib/commons-lang-x.jar", StrMatcher.class));
+        jars.add(copyJar("lib/datanucleus-core-x.jar", FetchGroup.class));
+        jars.add(copyJar("lib/datanucleus-rdbms-x.jar", RDBMSStoreManager.class));
+        jars.add(copyJar("lib/jdo-x.jar", javax.jdo.metadata.TypeMetadata.class));
+        jars.add(copyJar("lib/derby.jar", DerbyIOException.class));
+        jars.add(copyJar("lib/jline.jar", jline.FileNameCompletor.class));
+        jars.add(copyJar("lib/velocity-x.jar", VelocityEngine.class));
+        jars.add(copyJar("lib/hive-cli-x.jar", CliSessionState.class));
+        jars.add(copyJar("lib/hive-common-x.jar", HiveConf.class));
+        jars.add(copyJar("lib/hive-exec-x.jar", ExecDriver.class));
+        jars.add(copyJar("lib/hive-metastore-x.jar", HiveMetaStore.class));
+        jars.add(copyJar("lib/hive-serde-x.jar", SerDe.class));
+        jars.add(copyJar("lib/hive-service-x.jar", HiveServer.class));
+        jars.add(copyJar("lib/hive-shims-x.jar", Hadoop20Shims.class));
+        jars.add(copyJar("lib/hive-contrib-x.jar", RegexSerDe.class));
+
+        XConfiguration protoConf = new XConfiguration();
+        protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
+        protoConf.set(WorkflowAppService.HADOOP_UGI, getTestUser() + "," + getTestGroup());
+        protoConf.set(OozieClient.GROUP_NAME, getTestGroup());
+        injectKerberosInfo(protoConf);
+        protoConf.setStrings(WorkflowAppService.APP_LIB_PATH_LIST,
+                                    jars.toArray(new String[jars.size()]));
+
+        WorkflowJobBean wf = createBaseWorkflow(protoConf, "hive-action");
+        WorkflowActionBean action = (WorkflowActionBean) wf.getActions().get(0);
+        action.setType(ae.getType());
+        action.setConf(actionXml);
+
+        return new Context(wf, action);
+    }
+
+}
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
new file mode 100644
index 000000000..9e8b6d638
--- /dev/null
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
@@ -0,0 +1,222 @@
+/**
+ * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. See accompanying LICENSE file.
+ */
+package org.apache.oozie.action.hadoop;
+
+import com.facebook.fb303.FacebookBase;
+import org.antlr.runtime.ANTLRFileStream;
+import org.apache.commons.collections.Bag;
+import org.apache.commons.lang.text.StrMatcher;
+import org.apache.derby.iapi.services.io.DerbyIOException;
+import org.apache.hadoop.filecache.DistributedCache;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.cli.CliSessionState;
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.contrib.serde2.RegexSerDe;
+import org.apache.hadoop.hive.metastore.HiveMetaStore;
+import org.apache.hadoop.hive.ql.exec.ExecDriver;
+import org.apache.hadoop.hive.serde2.SerDe;
+import org.apache.hadoop.hive.service.HiveServer;
+import org.apache.hadoop.hive.shims.Hadoop20Shims;
+import org.apache.oozie.util.ClassUtils;
+import org.apache.oozie.util.IOUtils;
+import org.apache.oozie.util.XConfiguration;
+import org.apache.thrift.TBase;
+import org.apache.velocity.app.VelocityEngine;
+import org.datanucleus.FetchGroup;
+import org.datanucleus.store.rdbms.RDBMSStoreManager;
+import org.json.JSONML;
+import org.objectweb.asm.ByteVector;
+
+import javax.jdo.Query;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestHiveMain extends MainTestCase {
+    private SecurityManager SECURITY_MANAGER;
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        SECURITY_MANAGER = System.getSecurityManager();
+    }
+
+    protected void tearDown() throws Exception {
+        System.setSecurityManager(SECURITY_MANAGER);
+        super.tearDown();
+    }
+
+    private static final String NEW_LINE =
+        System.getProperty("line.separator", "\n");
+
+    private String getHiveScript(String inputPath, String outputPath) {
+        StringBuilder buffer = new StringBuilder(NEW_LINE);
+        buffer.append("set -v;").append(NEW_LINE);
+        buffer.append("CREATE EXTERNAL TABLE test (a INT) STORED AS");
+        buffer.append(NEW_LINE).append("TEXTFILE LOCATION '");
+        buffer.append(inputPath).append("';").append(NEW_LINE);
+        buffer.append("INSERT OVERWRITE DIRECTORY '");
+        buffer.append(outputPath).append("'").append(NEW_LINE);
+        buffer.append("SELECT (a-1) FROM test;").append(NEW_LINE);
+
+        return buffer.toString();
+    }
+
+    private String copyJar(String targetFile, Class<?> anyContainedClass)
+            throws Exception {
+        String file = ClassUtils.findContainingJar(anyContainedClass);
+        System.out.println("[copy-jar] class: " + anyContainedClass
+                + ", local jar ==> " + file);
+        Path targetPath = new Path(getFsTestCaseDir(), targetFile);
+        FileSystem fs = getFileSystem();
+        InputStream is = new FileInputStream(file);
+        OutputStream os = fs.create(targetPath);
+        IOUtils.copyStream(is, os);
+        return targetPath.toString();
+    }
+
+    public Void call() throws Exception {
+        if (System.getenv("HADOOP_HOME") == null) {
+            System.out.println("WARNING: 'HADOOP_HOME' env var not defined, TestHiveMain test is not running");
+        }
+        else {
+            FileSystem fs = getFileSystem();
+
+            List<String> jars = new ArrayList<String>();
+            jars.add(copyJar("lib/libfb303-x.jar", FacebookBase.class));
+            jars.add(copyJar("lib/libthrift-x.jar", TBase.class));
+            jars.add(copyJar("lib/libjson-x.jar", JSONML.class));
+            jars.add(copyJar("lib/jdo2-api-x.jar", Query.class));
+            jars.add(copyJar("lib/antlr-runtime-x.jar", ANTLRFileStream.class));
+            jars.add(copyJar("lib/asm-x.jar", ByteVector.class));
+            jars.add(copyJar("lib/commons-collection-x.jar", Bag.class));
+            jars.add(copyJar("lib/commons-lang-x.jar", StrMatcher.class));
+            jars.add(copyJar("lib/datanucleus-core-x.jar", FetchGroup.class));
+            jars.add(copyJar("lib/datanucleus-rdbms-x.jar", RDBMSStoreManager.class));
+            jars.add(copyJar("lib/jdo-x.jar", javax.jdo.metadata.TypeMetadata.class));
+            jars.add(copyJar("lib/derby.jar", DerbyIOException.class));
+            jars.add(copyJar("lib/velocity-x.jar", VelocityEngine.class));
+            jars.add(copyJar("lib/jline.jar", jline.FileNameCompletor.class));
+
+            jars.add(copyJar("lib/hive-cli-x.jar", CliSessionState.class));
+            jars.add(copyJar("lib/hive-common-x.jar", HiveConf.class));
+            jars.add(copyJar("lib/hive-exec-x.jar", ExecDriver.class));
+            jars.add(copyJar("lib/hive-metastore-x.jar", HiveMetaStore.class));
+            jars.add(copyJar("lib/hive-serde-x.jar", SerDe.class));
+            jars.add(copyJar("lib/hive-service-x.jar", HiveServer.class));
+            jars.add(copyJar("lib/hive-shims-x.jar", Hadoop20Shims.class));
+            jars.add(copyJar("lib/hive-contrib-x.jar", RegexSerDe.class));
+
+            Path inputDir = new Path(getFsTestCaseDir(), "input");
+            fs.mkdirs(inputDir);
+            Writer writer = new OutputStreamWriter(fs.create(new Path(inputDir, "data.txt")));
+            writer.write("3\n4\n6\n1\n2\n7\n9\n0\n8\n");
+            writer.close();
+
+            Path outputDir = new Path(getFsTestCaseDir(), "output");
+
+            Path script = new Path(getTestCaseDir(), "script.q");
+            Writer w = new FileWriter(script.toString());
+            w.write(getHiveScript("${IN}", "${OUT}"));
+            w.close();
+
+            XConfiguration jobConf = new XConfiguration();
+
+            jobConf.set("user.name", getTestUser());
+            jobConf.set("group.name", getTestGroup());
+            jobConf.setInt("mapred.map.tasks", 1);
+            jobConf.setInt("mapred.map.max.attempts", 1);
+            jobConf.setInt("mapred.reduce.max.attempts", 1);
+            jobConf.set("mapred.job.tracker", getJobTrackerUri());
+            jobConf.set("fs.default.name", getNameNodeUri());
+            jobConf.set("javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:hive-main;create=true");
+            jobConf.set("javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
+            jobConf.set("javax.jdo.option.ConnectionUserName", "sa");
+            injectKerberosInfo(jobConf);
+
+            for (String jar : jars) {
+                DistributedCache.addFileToClassPath(new Path(new Path(jar).toUri().getPath()),
+                                                    getFileSystem().getConf());
+            }
+
+            HiveMain.setHiveScript(jobConf, script.toString(), new String[]{"IN=" + inputDir.toUri().getPath(),
+                    "OUT=" + outputDir.toUri().getPath()});
+
+            File actionXml = new File(getTestCaseDir(), "action.xml");
+            OutputStream os = new FileOutputStream(actionXml);
+            jobConf.writeXml(os);
+            os.close();
+
+            //needed in the testcase classpath
+            URL url = Thread.currentThread().getContextClassLoader().getResource("PigMain.txt");
+            File classPathDir = new File(url.getPath()).getParentFile();
+            assertTrue(classPathDir.exists());
+            File hiveSite = new File(classPathDir, "hive-site.xml");
+
+            InputStream is = IOUtils.getResourceAsStream("user-hive-default.xml", -1);
+            os = new FileOutputStream(new File(classPathDir, "hive-default.xml"));
+            IOUtils.copyStream(is, os);
+
+            File outputDataFile = new File(getTestCaseDir(), "outputdata.properties");
+
+            setSystemProperty("oozie.launcher.job.id", "" + System.currentTimeMillis());
+            setSystemProperty("oozie.action.conf.xml", actionXml.getAbsolutePath());
+            setSystemProperty("oozie.action.output.properties", outputDataFile.getAbsolutePath());
+
+            new LauncherSecurityManager();
+            String user = System.getProperty("user.name");
+            try {
+                os = new FileOutputStream(hiveSite);
+                jobConf.writeXml(os);
+                os.close();
+                HiveMain.main(null);
+            }
+            catch (SecurityException ex) {
+                if (LauncherSecurityManager.getExitInvoked()) {
+                    System.out.println("Intercepting System.exit(" + LauncherSecurityManager.getExitCode() + ")");
+                    System.err.println("Intercepting System.exit(" + LauncherSecurityManager.getExitCode() + ")");
+                    if (LauncherSecurityManager.getExitCode() != 0) {
+                        fail();
+                    }
+                }
+                else {
+                    throw ex;
+                }
+            }
+            finally {
+                System.setProperty("user.name", user);
+                hiveSite.delete();
+            }
+
+            assertTrue(outputDataFile.exists());
+
+//TODO: I cannot figure out why when log file is not created in this testcase, it works when running in Launcher
+//            Properties props = new Properties();
+//            props.load(new FileReader(outputDataFile));
+//            assertTrue(props.containsKey("hadoopJobs"));
+//            assertTrue(props.getProperty("hadoopJobs").trim().length() > 0);
+        }
+        return null;
+    }
+
+}
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
index 8c7fcc49b..c4d1c65d6 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
@@ -52,6 +52,7 @@ public Void call() throws Exception {
 
         jobConf.set("user.name", getTestUser());
         jobConf.set("hadoop.job.ugi", getTestUser() + "," + getTestGroup());
+
         injectKerberosInfo(jobConf);
         
         File actionXml = new File(getTestCaseDir(), "action.xml");
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitCommand.java
index 4952e74c2..a7b3872ea 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitCommand.java
@@ -54,6 +54,7 @@ public void testSubmitReservedVars() throws Exception {
         conf.set(OozieClient.USER_NAME, getTestUser());
         conf.set(OozieClient.GROUP_NAME, "other");
         conf.set("GB", "5");
+        injectKerberosInfo(conf);
         SubmitCommand sc = new SubmitCommand(conf, "UNIT_TESTING");
 
         try {
@@ -123,6 +124,7 @@ public void testAppPathIsFileNegative() throws Exception {
         conf.set(OozieClient.APP_PATH, appPath+"/does_not_exist.xml");
         conf.set(OozieClient.USER_NAME, getTestUser());
         conf.set(OozieClient.GROUP_NAME, "other");
+        injectKerberosInfo(conf);
         SubmitCommand sc = new SubmitCommand(conf, "UNIT_TESTING");
 
         try {
diff --git a/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java b/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
index 199786718..f961ddce6 100644
--- a/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
@@ -81,9 +81,11 @@ public void testReadDefinition() throws Exception {
             Writer writer = new FileWriter(getTestCaseDir() + "/workflow.xml");
             IOUtils.copyCharStream(reader, writer);
 
+            Configuration conf = new XConfiguration();
+            injectKerberosInfo(conf);
             WorkflowAppService wps = services.get(WorkflowAppService.class);
-            String wfDef = wps.readDefinition("file://" + getTestCaseDir() + File.separator + "workflow.xml", getTestUser(), "group",
-                                              "authToken");
+            String wfDef = wps.readDefinition("file://" + getTestCaseDir() + File.separator + "workflow.xml",
+                                              getTestUser(), "group", "authToken", conf);
             assertNotNull(reader.toString(), wfDef);
         }
         finally {
@@ -200,6 +202,7 @@ public void testActionNameLength() throws Exception {
             jobConf.set(OozieClient.APP_PATH, "file://" + getTestCaseDir() + File.separator + "workflow.xml");
             jobConf.set(OozieClient.USER_NAME, getTestUser());
             jobConf.set(OozieClient.GROUP_NAME, "group");
+            injectKerberosInfo(jobConf);
 
             try {
                 LiteWorkflowApp app = (LiteWorkflowApp) wps.parseDef(jobConf, "authToken");
diff --git a/core/src/test/resources/user-hive-default.xml b/core/src/test/resources/user-hive-default.xml
new file mode 100644
index 000000000..b5b001cb6
--- /dev/null
+++ b/core/src/test/resources/user-hive-default.xml
@@ -0,0 +1,434 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+<!-- Hive Configuration can either be stored in this file or in the hadoop configuration files  -->
+<!-- that are implied by Hadoop setup variables.                                                -->
+<!-- Aside from Hadoop setup variables - this file is provided as a convenience so that Hive    -->
+<!-- users do not have to edit hadoop configuration files (that may be managed as a centralized -->
+<!-- resource).                                                                                 -->
+
+<!-- Hive Execution Parameters -->
+<property>
+  <name>mapred.reduce.tasks</name>
+  <value>-1</value>
+    <description>The default number of reduce tasks per job.  Typically set
+  to a prime close to the number of available hosts.  Ignored when
+  mapred.job.tracker is "local". Hadoop set this to 1 by default, whereas hive uses -1 as its default value.
+  By setting this property to -1, Hive will automatically figure out what should be the number of reducers.
+  </description>
+</property>
+
+<property>
+  <name>hive.exec.reducers.bytes.per.reducer</name>
+  <value>1000000000</value>
+  <description>size per reducer.The default is 1G, i.e if the input size is 10G, it will use 10 reducers.</description>
+</property>
+
+<property>
+  <name>hive.exec.reducers.max</name>
+  <value>999</value>
+  <description>max number of reducers will be used. If the one
+	specified in the configuration parameter mapred.reduce.tasks is
+	negative, hive will use this one as the max number of reducers when
+	automatically determine number of reducers.</description>
+</property>
+
+<property>
+  <name>hive.exec.scratchdir</name>
+  <value>/tmp/hive-${user.name}</value>
+  <description>Scratch space for Hive jobs</description>
+</property>
+
+<property>
+  <name>hive.test.mode</name>
+  <value>false</value>
+  <description>whether hive is running in test mode. If yes, it turns on sampling and prefixes the output tablename</description>
+</property>
+
+<property>
+  <name>hive.test.mode.prefix</name>
+  <value>test_</value>
+  <description>if hive is running in test mode, prefixes the output table by this string</description>
+</property>
+
+<!-- If the input table is not bucketed, the denominator of the tablesample is determinied by the parameter below   -->
+<!-- For example, the following query:                                                                              -->
+<!--   INSERT OVERWRITE TABLE dest                                                                                  -->
+<!--   SELECT col1 from src                                                                                         -->
+<!-- would be converted to                                                                                          -->
+<!--   INSERT OVERWRITE TABLE test_dest                                                                             -->
+<!--   SELECT col1 from src TABLESAMPLE (BUCKET 1 out of 32 on rand(1))                                             -->
+<property>
+  <name>hive.test.mode.samplefreq</name>
+  <value>32</value>
+  <description>if hive is running in test mode and table is not bucketed, sampling frequency</description>
+</property>
+
+<property>
+  <name>hive.test.mode.nosamplelist</name>
+  <value></value>
+  <description>if hive is running in test mode, dont sample the above comma seperated list of tables</description>
+</property>
+
+<property>
+  <name>hive.metastore.local</name>
+  <value>true</value>
+  <description>controls whether to connect to remove metastore server or open a new metastore server in Hive Client JVM</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionURL</name>
+  <value>jdbc:derby:;databaseName=metastore_db;create=true</value>
+  <description>JDBC connect string for a JDBC metastore</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionDriverName</name>
+  <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+  <description>Driver class name for a JDBC metastore</description>
+</property>
+
+<property>
+  <name>javax.jdo.PersistenceManagerFactoryClass</name>
+  <value>org.datanucleus.jdo.JDOPersistenceManagerFactory</value>
+  <description>class implementing the jdo persistence</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.DetachAllOnCommit</name>
+  <value>true</value>
+  <description>detaches all objects from session so that they can be used after transaction is committed</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.NonTransactionalRead</name>
+  <value>true</value>
+  <description>reads outside of transactions</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionUserName</name>
+  <value>APP</value>
+  <description>username to use against metastore database</description>
+</property>
+
+<!--<property>-->
+  <!--<name>javax.jdo.option.ConnectionPassword</name>-->
+  <!--<value>mine</value>-->
+  <!--<description>password to use against metastore database</description>-->
+<!--</property>-->
+
+<property>
+  <name>datanucleus.validateTables</name>
+  <value>false</value>
+  <description>validates existing schema against code. turn this on if you want to verify existing schema </description>
+</property>
+
+<property>
+  <name>datanucleus.validateColumns</name>
+  <value>false</value>
+  <description>validates existing schema against code. turn this on if you want to verify existing schema </description>
+</property>
+
+<property>
+  <name>datanucleus.validateConstraints</name>
+  <value>false</value>
+  <description>validates existing schema against code. turn this on if you want to verify existing schema </description>
+</property>
+
+<property>
+  <name>datanucleus.storeManagerType</name>
+  <value>rdbms</value>
+  <description>metadata store type</description>
+</property>
+
+<property>
+  <name>datanucleus.autoCreateSchema</name>
+  <value>true</value>
+  <description>creates necessary schema on a startup if one doesn't exist. set this to false, after creating it once</description>
+</property>
+
+<property>
+  <name>datanucleus.autoStartMechanismMode</name>
+  <value>checked</value>
+  <description>throw exception if metadata tables are incorrect</description>
+</property>
+
+<property>
+  <name>datancucleus.transactionIsolation</name>
+  <value>read-committed</value>
+  <description></description>
+</property>
+
+<property>
+  <name>datanuclues.cache.level2</name>
+  <value>true</value>
+  <description>use a level 2 cache. turn this off if metadata is changed independently of hive metastore server</description>
+</property>
+
+<property>
+  <name>datanuclues.cache.level2.type</name>
+  <value>SOFT</value>
+  <description>SOFT=soft reference based cache, WEAK=weak reference based cache.</description>
+</property>
+
+<property>
+  <name>hive.metastore.warehouse.dir</name>
+  <value>/user/hive/warehouse</value>
+  <description>location of default database for the warehouse</description>
+</property>
+
+<property>
+  <name>hive.metastore.connect.retries</name>
+  <value>5</value>
+  <description>Number of retries while opening a connection to metastore</description>
+</property>
+
+<property>
+  <name>hive.metastore.rawstore.impl</name>
+  <value>org.apache.hadoop.hive.metastore.ObjectStore</value>
+  <description>Name of the class that implements org.apache.hadoop.hive.metastore.rawstore interface. This class is used to store and retrieval of raw metadata objects such as table, database</description>
+</property>
+
+<property>
+  <name>hive.default.fileformat</name>
+  <value>TextFile</value>
+  <description>Default file format for CREATE TABLE statement. Options are TextFile and SequenceFile. Users can explicitly say CREATE TABLE ... STORED AS &lt;TEXTFILE|SEQUENCEFILE&gt; to override</description>
+</property>
+
+<property>
+  <name>hive.fileformat.check</name>
+  <value>true</value>
+  <description>Whether to check file format or not when loading data files</description>
+</property>
+
+<property>
+  <name>hive.map.aggr</name>
+  <value>true</value>
+  <description>Whether to use map-side aggregation in Hive Group By queries</description>
+</property>
+
+<property>
+  <name>hive.groupby.skewindata</name>
+  <value>false</value>
+  <description>Whether there is skew in data to optimize group by queries</description>
+</property>
+
+<property>
+  <name>hive.groupby.mapaggr.checkinterval</name>
+  <value>100000</value>
+  <description>Number of rows after which size of the grouping keys/aggregation classes is performed</description>
+</property>
+
+<property>
+  <name>hive.mapred.local.mem</name>
+  <value>0</value>
+  <description>For local mode, memory of the mappers/reducers</description>
+</property>
+
+<property>
+  <name>hive.map.aggr.hash.percentmemory</name>
+  <value>0.5</value>
+  <description>Portion of total memory to be used by map-side grup aggregation hash table</description>
+</property>
+
+<property>
+  <name>hive.map.aggr.hash.min.reduction</name>
+  <value>0.5</value>
+  <description>Hash aggregation will be turned off if the ratio between hash
+  table size and input rows is bigger than this number. Set to 1 to make sure
+  hash aggregation is never turned off.</description>
+</property>
+
+<property>
+  <name>hive.optimize.cp</name>
+  <value>true</value>
+  <description>Whether to enable column pruner</description>
+</property>
+
+<property>
+  <name>hive.optimize.ppd</name>
+  <value>true</value>
+  <description>Whether to enable predicate pushdown</description>
+</property>
+
+<property>
+  <name>hive.optimize.pruner</name>
+  <value>true</value>
+  <description>Whether to enable the new partition pruner which depends on predicate pushdown. If this is disabled,
+  the old partition pruner which is based on AST will be enabled.</description>
+</property>
+
+<property>
+  <name>hive.optimize.groupby</name>
+  <value>true</value>
+  <description>Whether to enable the bucketed group by from bucketed partitions/tables.</description>
+</property>
+
+<property>
+  <name>hive.join.emit.interval</name>
+  <value>1000</value>
+  <description>How many rows in the right-most join operand Hive should buffer before emitting the join result. </description>
+</property>
+
+<property>
+  <name>hive.join.cache.size</name>
+  <value>25000</value>
+  <description>How many rows in the joining tables (except the streaming table) should be cached in memory. </description>
+</property>
+
+<property>
+  <name>hive.mapjoin.bucket.cache.size</name>
+  <value>100</value>
+  <description>How many values in each keys in the map-joined table should be cached in memory. </description>
+</property>
+
+<property>
+  <name>hive.mapjoin.maxsize</name>
+  <value>100000</value>
+  <description>Maximum # of rows of the small table that can be handled by map-side join. If the size is reached and hive.task.progress is set, a fatal error counter is set and the job will be killed.</description>
+</property>
+
+<property>
+  <name>hive.mapjoin.cache.numrows</name>
+  <value>25000</value>
+  <description>How many rows should be cached by jdbm for map join. </description>
+</property>
+
+<property>
+  <name>hive.mapred.mode</name>
+  <value>nonstrict</value>
+  <description>The mode in which the hive operations are being performed. In strict mode, some risky queries are not allowed to run</description>
+</property>
+
+<property>
+  <name>hive.exec.script.maxerrsize</name>
+  <value>100000</value>
+  <description>Maximum number of bytes a script is allowed to emit to standard error (per map-reduce task). This prevents runaway scripts from filling logs partitions to capacity </description>
+</property>
+
+<property>
+  <name>hive.exec.script.allow.partial.consumption</name>
+  <value>false</value>
+  <description> When enabled, this option allows a user script to exit successfully without consuming all the data from the standard input.
+  </description>
+</property>
+
+<property>
+  <name>hive.script.operator.id.env.var</name>
+  <value>HIVE_SCRIPT_OPERATOR_ID</value>
+  <description> Name of the environment variable that holds the unique script operator ID in the user's transform function (the custom mapper/reducer that the user has specified in the query)
+  </description>
+</property>
+
+<property>
+  <name>hive.exec.compress.output</name>
+  <value>false</value>
+  <description> This controls whether the final outputs of a query (to a local/hdfs file or a hive table) is compressed. The compression codec and other options are determined from hadoop config variables mapred.output.compress* </description>
+</property>
+
+<property>
+  <name>hive.exec.compress.intermediate</name>
+  <value>false</value>
+  <description> This controls whether intermediate files produced by hive between multiple map-reduce jobs are compressed. The compression codec and other options are determined from hadoop config variables mapred.output.compress* </description>
+</property>
+
+<property>
+  <name>hive.exec.parallel</name>
+  <value>false</value>
+  <description>Whether to execute jobs in parallel</description>
+</property>
+
+<property>
+  <name>hive.hwi.war.file</name>
+  <value>lib/hive-hwi-0.5.0+20.war</value>
+  <description>This sets the path to the HWI war file, relative to ${HIVE_HOME}. </description>
+</property>
+
+<property>
+  <name>hive.hwi.listen.host</name>
+  <value>0.0.0.0</value>
+  <description>This is the host address the Hive Web Interface will listen on</description>
+</property>
+
+<property>
+  <name>hive.hwi.listen.port</name>
+  <value>9999</value>
+  <description>This is the port the Hive Web Interface will listen on</description>
+</property>
+
+<property>
+  <name>hive.exec.pre.hooks</name>
+  <value></value>
+  <description>Pre Execute Hook for Tests</description>
+</property>
+
+<property>
+  <name>hive.merge.mapfiles</name>
+  <value>true</value>
+  <description>Merge small files at the end of a map-only job</description>
+</property>
+
+<property>
+  <name>hive.merge.mapredfiles</name>
+  <value>false</value>
+  <description>Merge small files at the end of any job(map only or map-reduce)</description>
+</property>
+
+<property>
+  <name>hive.heartbeat.interval</name>
+  <value>1000</value>
+  <description>Send a heartbeat after this interval - used by mapjoin and filter operators</description>
+</property>
+
+<property>
+  <name>hive.merge.size.per.task</name>
+  <value>256000000</value>
+  <description>Size of merged files at the end of the job</description>
+</property>
+
+<property>
+  <name>hive.script.auto.progress</name>
+  <value>false</value>
+  <description>Whether Hive Tranform/Map/Reduce Clause should automatically send progress information to TaskTracker to avoid the task getting killed because of inactivity.  Hive sends progress information when the script is outputting to stderr.  This option removes the need of periodically producing stderr messages, but users should be cautious because this may prevent infinite loops in the scripts to be killed by TaskTracker.  </description>
+</property>
+
+<property>
+  <name>hive.script.serde</name>
+  <value>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</value>
+  <description>The default serde for trasmitting input data to and reading output data from the user scripts. </description>
+</property>
+
+<property>
+  <name>hive.script.recordreader</name>
+  <value>org.apache.hadoop.hive.ql.exec.TextRecordReader</value>
+  <description>The default record reader for reading data from the user scripts. </description>
+</property>
+
+<property>
+  <name>hive.script.recordwriter</name>
+  <value>org.apache.hadoop.hive.ql.exec.TextRecordWriter</value>
+  <description>The default record writer for writing data to the user scripts. </description>
+</property>
+
+<property>
+  <name>hive.input.format</name>
+  <value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value>
+  <description>The default input format, if it is not specified, the system assigns it. It is set to HiveInputFormat for hadoop versions 17, 18 and 19, whereas it is set to CombinedHiveInputFormat for hadoop 20. The user can always overwrite it - if there is a bug in CombinedHiveInputFormat, it can always be manually set to HiveInputFormat. </description>
+</property>
+
+<property>
+  <name>hive.udtf.auto.progress</name>
+  <value>false</value>
+  <description>Whether Hive should automatically send progress information to TaskTracker when using UDTF's to prevent the task getting killed because of inactivity.  Users should be cautious because this may prevent TaskTracker from killing tasks with infinte loops.  </description>
+</property>
+
+<property>
+  <name>hive.mapred.reduce.tasks.speculative.execution</name>
+  <value>true</value>
+  <description>Whether speculative execution for reducers should be turned on. </description>
+</property>
+
+</configuration>
diff --git a/docs/src/site/twiki/DG_HiveActionExtension.twiki b/docs/src/site/twiki/DG_HiveActionExtension.twiki
new file mode 100644
index 000000000..10b7e2ee2
--- /dev/null
+++ b/docs/src/site/twiki/DG_HiveActionExtension.twiki
@@ -0,0 +1,221 @@
+<noautolink>
+
+[[index][::Go back to Oozie Documentation Index::]]
+
+-----
+
+---+!! Oozie Hive Action Extension
+
+%TOC%
+
+#HiveAction
+---++ Hive Action
+
+The =hive= action runs a Hive job.
+
+The workflow job will wait until the Hive job completes before
+continuing to the next action.
+
+To run the Hive job, you have to configure the =hive= action with the
+=job-tracker=, =name-node= and Hive =script= elements as
+well as the necessary parameters and configuration.
+
+A =hive= action can be configured to create or delete HDFS directories
+before starting the Hive job.
+
+Hive configuration can be specified with a file, using the =job-xml=
+element, and inline, using the =configuration= elements.
+
+Oozie EL expressions can be used in the inline configuration. Property
+values specified in the =configuration= element override values specified
+in the =job-xml= file.
+
+Note that Hadoop =mapred.job.tracker= and =fs.default.name= properties
+must not be present in the inline configuration.
+
+As with Hadoop =map-reduce= jobs, it is possible to add files and
+archives in order to make them available to the Hive job. Refer to the
+[WorkflowFunctionalSpec#FilesAchives][Adding Files and Archives for the Job]
+section for more information about this feature.
+
+Oozie Hive action supports Hive scripts with parameter variables, their
+syntax is =${VARIABLES}=.
+
+*Syntax:*
+
+<verbatim>
+<workflow-app name="[WF-DEF-NAME]" xmlns="uri:oozie:workflow:0.1">
+    ...
+    <action name="[NODE-NAME]">
+        <hive xmlns="uri:oozie:hive-action:0.2">
+            <job-tracker>[JOB-TRACKER]</job-tracker>
+            <name-node>[NAME-NODE]</name-node>
+            <prepare>
+               <delete path="[PATH]"/>
+               ...
+               <mkdir path="[PATH]"/>
+               ...
+            </prepare>
+            <job-xml>[HIVE SETTINGS FILE]</job-xml>
+            <configuration>
+                <property>
+                    <name>[PROPERTY-NAME]</name>
+                    <value>[PROPERTY-VALUE]</value>
+                </property>
+                ...
+            </configuration>
+            <script>[HIVE-SCRIPT]</script>
+            <param>[PARAM-VALUE]</param>
+                ...
+            <param>[PARAM-VALUE]</param>
+            <file>[FILE-PATH]</file>
+            ...
+            <archive>[FILE-PATH]</archive>
+            ...
+        </hive>
+        <ok to="[NODE-NAME]"/>
+        <error to="[NODE-NAME]"/>
+    </action>
+    ...
+</workflow-app>
+</verbatim>
+
+The =prepare= element, if present, indicates a list of paths to delete
+or create before starting the job. Specified paths must start with =hdfs://HOST:PORT=.
+
+The =job-xml= element, if present, specifies a file containing configuration
+for the Hive job.
+
+The =configuration= element, if present, contains configuration
+properties that are passed to the Hive job.
+
+The =script= element must contain the path of the Hive script to
+execute. The Hive script can be templatized with variables of the form
+=${VARIABLE}=. The values of these variables can then be specified
+using the =params= element.
+
+The =params= element, if present, contains parameters to be passed to
+the Hive script.
+
+All the above elements can be parameterized (templatized) using EL
+expressions.
+
+*Example:*
+
+<verbatim>
+<workflow-app name="sample-wf" xmlns="uri:oozie:workflow:0.1">
+    ...
+    <action name="myfirsthivejob">
+        <hive xmlns="uri:oozie:hive-action:0.2">
+            <job-traker>foo:9001</job-tracker>
+            <name-node>bar:9000</name-node>
+            <prepare>
+                <delete path="${jobOutput}"/>
+            </prepare>
+            <configuration>
+                <property>
+                    <name>mapred.compress.map.output</name>
+                    <value>true</value>
+                </property>
+                <property>
+                    <name>oozie.hive.defaults</name>
+                    <value>/usr/foo/hive-0.6-default.xml</value>
+                </property>
+            </configuration>
+            <script>myscript.q</script>
+            <param>InputDir=/home/tucu/input-data</param>
+            <param>OutputDir=${jobOutput}</param>
+        </hive>
+        <ok to="myotherjob"/>
+        <error to="errorcleanup"/>
+    </action>
+    ...
+</workflow-app>
+</verbatim>
+
+---+++ Hive Default and Site Configuration Files
+
+All the properties defined in the =job-xml= and inline in the =configuration=
+element become the =hive-site.xml= that Hive will use.
+
+Hive (as of Hive 0.6) does not yet include a =hive-default.xml= file, it is the responsibility
+of the user to provide one. When using Oozie Hive action, the =hive-default.xml= file must be
+copied to HDFS and in the Hive action =configuration= section it must be set in the =oozie.hive.defaults=
+property. If a relative path is given, the path will be resolved within the workflow application
+directory.
+
+*NOTE:* When Hive starts bundling a =hive-default.xml= file within its JARs, Oozie will ignore
+the =hive-default.xml= file specified in the Hive action configuration.
+
+If a =hive-site.xml= file is not specified (or available in Hive JARs), the Oozie Hive action will fail.
+
+---+++ Hive Action Logging
+
+Hive action logs are redirected to the Oozie Launcher map-reduce job task STDOUT/STDERR that runs Hive.
+
+From Oozie web-console, from the Hive action pop up using the 'Console URL' link, it is possible
+to navigate to the Oozie Launcher map-reduce job task logs via the Hadoop job-tracker web-console.
+
+The logging level of the Hive action can set in the Hive action configuration using the
+property =oozie.hive.log.level=. The default value is =INFO=.
+
+---++ Appendix, Hive XML-Schema
+
+---+++ AE.A Appendix A, Hive XML-Schema
+
+<verbatim>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:hive="uri:oozie:hive-action:0.2" elementFormDefault="qualified"
+           targetNamespace="uri:oozie:hive-action:0.2">
+.
+    <xs:element name="hive" type="hive:ACTION"/>
+.
+    <xs:complexType name="ACTION">
+        <xs:sequence>
+            <xs:element name="job-tracker" type="xs:string" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="name-node" type="xs:string" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="prepare" type="hive:PREPARE" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="job-xml" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="configuration" type="hive:CONFIGURATION" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="script" type="xs:string" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="file" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="archive" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+.
+    <xs:complexType name="CONFIGURATION">
+        <xs:sequence>
+            <xs:element name="property" minOccurs="1" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="name" minOccurs="1" maxOccurs="1" type="xs:string"/>
+                        <xs:element name="value" minOccurs="1" maxOccurs="1" type="xs:string"/>
+                        <xs:element name="description" minOccurs="0" maxOccurs="1" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+.
+    <xs:complexType name="PREPARE">
+        <xs:sequence>
+            <xs:element name="delete" type="hive:DELETE" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="mkdir" type="hive:MKDIR" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+.
+    <xs:complexType name="DELETE">
+        <xs:attribute name="path" type="xs:string" use="required"/>
+    </xs:complexType>
+.
+    <xs:complexType name="MKDIR">
+        <xs:attribute name="path" type="xs:string" use="required"/>
+    </xs:complexType>
+.
+</xs:schema>
+</verbatim>
+
+[[index][::Go back to Oozie Documentation Index::]]
+
+</noautolink>
diff --git a/docs/src/site/twiki/index.twiki b/docs/src/site/twiki/index.twiki
index 247d14f36..717a1d26f 100644
--- a/docs/src/site/twiki/index.twiki
+++ b/docs/src/site/twiki/index.twiki
@@ -46,6 +46,10 @@ Enough reading already? Follow the steps in [[DG_QuickStart][Oozie Quick Start]]
    * [[DG_CustomActionExecutor][Writing a Custom Action Executor]]
    * [[./apidocs/index.html][Oozie Javadocs]]
 
+---+++ Actions Extension
+
+   * [[DG_HiveActionExtension][Hive Action]]
+
 ---++ Administrator Documentation
 
    * [[AG_Install][Oozie Install]]
diff --git a/examples/pom.xml b/examples/pom.xml
index 23c0eb036..9dc3d5ba7 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -39,6 +39,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
         <dependency>
             <groupId>com.yahoo.oozie</groupId>
             <artifactId>oozie-core</artifactId>
@@ -65,15 +71,13 @@
         </dependency>
 
         <dependency>
-            <!-- groupId to be correct by GH-0226 -->
-            <groupId>com.yahoo.hadoop</groupId>
+            <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <!-- groupId to be correct by GH-0226 -->
-            <groupId>com.yahoo.hadoop</groupId>
+            <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-test</artifactId>
             <scope>test</scope>
         </dependency>
@@ -84,6 +88,11 @@
            <scope>test</scope>
         </dependency>
 
+        <dependency>
+           <groupId>org.apache.derby</groupId>
+           <artifactId>derby</artifactId>
+           <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/examples/src/main/apps/hive/job.properties b/examples/src/main/apps/hive/job.properties
new file mode 100644
index 000000000..fc2745946
--- /dev/null
+++ b/examples/src/main/apps/hive/job.properties
@@ -0,0 +1,5 @@
+oozie.wf.application.path=hdfs://localhost:9000/user/${user.name}/examples/apps/hive
+jobTracker=localhost:9001
+nameNode=hdfs://localhost:9000
+queueName=default
+oozie.libpath=/user/${user.name}/examples/apps/examples-lib
diff --git a/examples/src/main/apps/hive/my-hive-default.xml b/examples/src/main/apps/hive/my-hive-default.xml
new file mode 100644
index 000000000..b5b001cb6
--- /dev/null
+++ b/examples/src/main/apps/hive/my-hive-default.xml
@@ -0,0 +1,434 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<configuration>
+
+<!-- Hive Configuration can either be stored in this file or in the hadoop configuration files  -->
+<!-- that are implied by Hadoop setup variables.                                                -->
+<!-- Aside from Hadoop setup variables - this file is provided as a convenience so that Hive    -->
+<!-- users do not have to edit hadoop configuration files (that may be managed as a centralized -->
+<!-- resource).                                                                                 -->
+
+<!-- Hive Execution Parameters -->
+<property>
+  <name>mapred.reduce.tasks</name>
+  <value>-1</value>
+    <description>The default number of reduce tasks per job.  Typically set
+  to a prime close to the number of available hosts.  Ignored when
+  mapred.job.tracker is "local". Hadoop set this to 1 by default, whereas hive uses -1 as its default value.
+  By setting this property to -1, Hive will automatically figure out what should be the number of reducers.
+  </description>
+</property>
+
+<property>
+  <name>hive.exec.reducers.bytes.per.reducer</name>
+  <value>1000000000</value>
+  <description>size per reducer.The default is 1G, i.e if the input size is 10G, it will use 10 reducers.</description>
+</property>
+
+<property>
+  <name>hive.exec.reducers.max</name>
+  <value>999</value>
+  <description>max number of reducers will be used. If the one
+	specified in the configuration parameter mapred.reduce.tasks is
+	negative, hive will use this one as the max number of reducers when
+	automatically determine number of reducers.</description>
+</property>
+
+<property>
+  <name>hive.exec.scratchdir</name>
+  <value>/tmp/hive-${user.name}</value>
+  <description>Scratch space for Hive jobs</description>
+</property>
+
+<property>
+  <name>hive.test.mode</name>
+  <value>false</value>
+  <description>whether hive is running in test mode. If yes, it turns on sampling and prefixes the output tablename</description>
+</property>
+
+<property>
+  <name>hive.test.mode.prefix</name>
+  <value>test_</value>
+  <description>if hive is running in test mode, prefixes the output table by this string</description>
+</property>
+
+<!-- If the input table is not bucketed, the denominator of the tablesample is determinied by the parameter below   -->
+<!-- For example, the following query:                                                                              -->
+<!--   INSERT OVERWRITE TABLE dest                                                                                  -->
+<!--   SELECT col1 from src                                                                                         -->
+<!-- would be converted to                                                                                          -->
+<!--   INSERT OVERWRITE TABLE test_dest                                                                             -->
+<!--   SELECT col1 from src TABLESAMPLE (BUCKET 1 out of 32 on rand(1))                                             -->
+<property>
+  <name>hive.test.mode.samplefreq</name>
+  <value>32</value>
+  <description>if hive is running in test mode and table is not bucketed, sampling frequency</description>
+</property>
+
+<property>
+  <name>hive.test.mode.nosamplelist</name>
+  <value></value>
+  <description>if hive is running in test mode, dont sample the above comma seperated list of tables</description>
+</property>
+
+<property>
+  <name>hive.metastore.local</name>
+  <value>true</value>
+  <description>controls whether to connect to remove metastore server or open a new metastore server in Hive Client JVM</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionURL</name>
+  <value>jdbc:derby:;databaseName=metastore_db;create=true</value>
+  <description>JDBC connect string for a JDBC metastore</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionDriverName</name>
+  <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+  <description>Driver class name for a JDBC metastore</description>
+</property>
+
+<property>
+  <name>javax.jdo.PersistenceManagerFactoryClass</name>
+  <value>org.datanucleus.jdo.JDOPersistenceManagerFactory</value>
+  <description>class implementing the jdo persistence</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.DetachAllOnCommit</name>
+  <value>true</value>
+  <description>detaches all objects from session so that they can be used after transaction is committed</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.NonTransactionalRead</name>
+  <value>true</value>
+  <description>reads outside of transactions</description>
+</property>
+
+<property>
+  <name>javax.jdo.option.ConnectionUserName</name>
+  <value>APP</value>
+  <description>username to use against metastore database</description>
+</property>
+
+<!--<property>-->
+  <!--<name>javax.jdo.option.ConnectionPassword</name>-->
+  <!--<value>mine</value>-->
+  <!--<description>password to use against metastore database</description>-->
+<!--</property>-->
+
+<property>
+  <name>datanucleus.validateTables</name>
+  <value>false</value>
+  <description>validates existing schema against code. turn this on if you want to verify existing schema </description>
+</property>
+
+<property>
+  <name>datanucleus.validateColumns</name>
+  <value>false</value>
+  <description>validates existing schema against code. turn this on if you want to verify existing schema </description>
+</property>
+
+<property>
+  <name>datanucleus.validateConstraints</name>
+  <value>false</value>
+  <description>validates existing schema against code. turn this on if you want to verify existing schema </description>
+</property>
+
+<property>
+  <name>datanucleus.storeManagerType</name>
+  <value>rdbms</value>
+  <description>metadata store type</description>
+</property>
+
+<property>
+  <name>datanucleus.autoCreateSchema</name>
+  <value>true</value>
+  <description>creates necessary schema on a startup if one doesn't exist. set this to false, after creating it once</description>
+</property>
+
+<property>
+  <name>datanucleus.autoStartMechanismMode</name>
+  <value>checked</value>
+  <description>throw exception if metadata tables are incorrect</description>
+</property>
+
+<property>
+  <name>datancucleus.transactionIsolation</name>
+  <value>read-committed</value>
+  <description></description>
+</property>
+
+<property>
+  <name>datanuclues.cache.level2</name>
+  <value>true</value>
+  <description>use a level 2 cache. turn this off if metadata is changed independently of hive metastore server</description>
+</property>
+
+<property>
+  <name>datanuclues.cache.level2.type</name>
+  <value>SOFT</value>
+  <description>SOFT=soft reference based cache, WEAK=weak reference based cache.</description>
+</property>
+
+<property>
+  <name>hive.metastore.warehouse.dir</name>
+  <value>/user/hive/warehouse</value>
+  <description>location of default database for the warehouse</description>
+</property>
+
+<property>
+  <name>hive.metastore.connect.retries</name>
+  <value>5</value>
+  <description>Number of retries while opening a connection to metastore</description>
+</property>
+
+<property>
+  <name>hive.metastore.rawstore.impl</name>
+  <value>org.apache.hadoop.hive.metastore.ObjectStore</value>
+  <description>Name of the class that implements org.apache.hadoop.hive.metastore.rawstore interface. This class is used to store and retrieval of raw metadata objects such as table, database</description>
+</property>
+
+<property>
+  <name>hive.default.fileformat</name>
+  <value>TextFile</value>
+  <description>Default file format for CREATE TABLE statement. Options are TextFile and SequenceFile. Users can explicitly say CREATE TABLE ... STORED AS &lt;TEXTFILE|SEQUENCEFILE&gt; to override</description>
+</property>
+
+<property>
+  <name>hive.fileformat.check</name>
+  <value>true</value>
+  <description>Whether to check file format or not when loading data files</description>
+</property>
+
+<property>
+  <name>hive.map.aggr</name>
+  <value>true</value>
+  <description>Whether to use map-side aggregation in Hive Group By queries</description>
+</property>
+
+<property>
+  <name>hive.groupby.skewindata</name>
+  <value>false</value>
+  <description>Whether there is skew in data to optimize group by queries</description>
+</property>
+
+<property>
+  <name>hive.groupby.mapaggr.checkinterval</name>
+  <value>100000</value>
+  <description>Number of rows after which size of the grouping keys/aggregation classes is performed</description>
+</property>
+
+<property>
+  <name>hive.mapred.local.mem</name>
+  <value>0</value>
+  <description>For local mode, memory of the mappers/reducers</description>
+</property>
+
+<property>
+  <name>hive.map.aggr.hash.percentmemory</name>
+  <value>0.5</value>
+  <description>Portion of total memory to be used by map-side grup aggregation hash table</description>
+</property>
+
+<property>
+  <name>hive.map.aggr.hash.min.reduction</name>
+  <value>0.5</value>
+  <description>Hash aggregation will be turned off if the ratio between hash
+  table size and input rows is bigger than this number. Set to 1 to make sure
+  hash aggregation is never turned off.</description>
+</property>
+
+<property>
+  <name>hive.optimize.cp</name>
+  <value>true</value>
+  <description>Whether to enable column pruner</description>
+</property>
+
+<property>
+  <name>hive.optimize.ppd</name>
+  <value>true</value>
+  <description>Whether to enable predicate pushdown</description>
+</property>
+
+<property>
+  <name>hive.optimize.pruner</name>
+  <value>true</value>
+  <description>Whether to enable the new partition pruner which depends on predicate pushdown. If this is disabled,
+  the old partition pruner which is based on AST will be enabled.</description>
+</property>
+
+<property>
+  <name>hive.optimize.groupby</name>
+  <value>true</value>
+  <description>Whether to enable the bucketed group by from bucketed partitions/tables.</description>
+</property>
+
+<property>
+  <name>hive.join.emit.interval</name>
+  <value>1000</value>
+  <description>How many rows in the right-most join operand Hive should buffer before emitting the join result. </description>
+</property>
+
+<property>
+  <name>hive.join.cache.size</name>
+  <value>25000</value>
+  <description>How many rows in the joining tables (except the streaming table) should be cached in memory. </description>
+</property>
+
+<property>
+  <name>hive.mapjoin.bucket.cache.size</name>
+  <value>100</value>
+  <description>How many values in each keys in the map-joined table should be cached in memory. </description>
+</property>
+
+<property>
+  <name>hive.mapjoin.maxsize</name>
+  <value>100000</value>
+  <description>Maximum # of rows of the small table that can be handled by map-side join. If the size is reached and hive.task.progress is set, a fatal error counter is set and the job will be killed.</description>
+</property>
+
+<property>
+  <name>hive.mapjoin.cache.numrows</name>
+  <value>25000</value>
+  <description>How many rows should be cached by jdbm for map join. </description>
+</property>
+
+<property>
+  <name>hive.mapred.mode</name>
+  <value>nonstrict</value>
+  <description>The mode in which the hive operations are being performed. In strict mode, some risky queries are not allowed to run</description>
+</property>
+
+<property>
+  <name>hive.exec.script.maxerrsize</name>
+  <value>100000</value>
+  <description>Maximum number of bytes a script is allowed to emit to standard error (per map-reduce task). This prevents runaway scripts from filling logs partitions to capacity </description>
+</property>
+
+<property>
+  <name>hive.exec.script.allow.partial.consumption</name>
+  <value>false</value>
+  <description> When enabled, this option allows a user script to exit successfully without consuming all the data from the standard input.
+  </description>
+</property>
+
+<property>
+  <name>hive.script.operator.id.env.var</name>
+  <value>HIVE_SCRIPT_OPERATOR_ID</value>
+  <description> Name of the environment variable that holds the unique script operator ID in the user's transform function (the custom mapper/reducer that the user has specified in the query)
+  </description>
+</property>
+
+<property>
+  <name>hive.exec.compress.output</name>
+  <value>false</value>
+  <description> This controls whether the final outputs of a query (to a local/hdfs file or a hive table) is compressed. The compression codec and other options are determined from hadoop config variables mapred.output.compress* </description>
+</property>
+
+<property>
+  <name>hive.exec.compress.intermediate</name>
+  <value>false</value>
+  <description> This controls whether intermediate files produced by hive between multiple map-reduce jobs are compressed. The compression codec and other options are determined from hadoop config variables mapred.output.compress* </description>
+</property>
+
+<property>
+  <name>hive.exec.parallel</name>
+  <value>false</value>
+  <description>Whether to execute jobs in parallel</description>
+</property>
+
+<property>
+  <name>hive.hwi.war.file</name>
+  <value>lib/hive-hwi-0.5.0+20.war</value>
+  <description>This sets the path to the HWI war file, relative to ${HIVE_HOME}. </description>
+</property>
+
+<property>
+  <name>hive.hwi.listen.host</name>
+  <value>0.0.0.0</value>
+  <description>This is the host address the Hive Web Interface will listen on</description>
+</property>
+
+<property>
+  <name>hive.hwi.listen.port</name>
+  <value>9999</value>
+  <description>This is the port the Hive Web Interface will listen on</description>
+</property>
+
+<property>
+  <name>hive.exec.pre.hooks</name>
+  <value></value>
+  <description>Pre Execute Hook for Tests</description>
+</property>
+
+<property>
+  <name>hive.merge.mapfiles</name>
+  <value>true</value>
+  <description>Merge small files at the end of a map-only job</description>
+</property>
+
+<property>
+  <name>hive.merge.mapredfiles</name>
+  <value>false</value>
+  <description>Merge small files at the end of any job(map only or map-reduce)</description>
+</property>
+
+<property>
+  <name>hive.heartbeat.interval</name>
+  <value>1000</value>
+  <description>Send a heartbeat after this interval - used by mapjoin and filter operators</description>
+</property>
+
+<property>
+  <name>hive.merge.size.per.task</name>
+  <value>256000000</value>
+  <description>Size of merged files at the end of the job</description>
+</property>
+
+<property>
+  <name>hive.script.auto.progress</name>
+  <value>false</value>
+  <description>Whether Hive Tranform/Map/Reduce Clause should automatically send progress information to TaskTracker to avoid the task getting killed because of inactivity.  Hive sends progress information when the script is outputting to stderr.  This option removes the need of periodically producing stderr messages, but users should be cautious because this may prevent infinite loops in the scripts to be killed by TaskTracker.  </description>
+</property>
+
+<property>
+  <name>hive.script.serde</name>
+  <value>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</value>
+  <description>The default serde for trasmitting input data to and reading output data from the user scripts. </description>
+</property>
+
+<property>
+  <name>hive.script.recordreader</name>
+  <value>org.apache.hadoop.hive.ql.exec.TextRecordReader</value>
+  <description>The default record reader for reading data from the user scripts. </description>
+</property>
+
+<property>
+  <name>hive.script.recordwriter</name>
+  <value>org.apache.hadoop.hive.ql.exec.TextRecordWriter</value>
+  <description>The default record writer for writing data to the user scripts. </description>
+</property>
+
+<property>
+  <name>hive.input.format</name>
+  <value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value>
+  <description>The default input format, if it is not specified, the system assigns it. It is set to HiveInputFormat for hadoop versions 17, 18 and 19, whereas it is set to CombinedHiveInputFormat for hadoop 20. The user can always overwrite it - if there is a bug in CombinedHiveInputFormat, it can always be manually set to HiveInputFormat. </description>
+</property>
+
+<property>
+  <name>hive.udtf.auto.progress</name>
+  <value>false</value>
+  <description>Whether Hive should automatically send progress information to TaskTracker when using UDTF's to prevent the task getting killed because of inactivity.  Users should be cautious because this may prevent TaskTracker from killing tasks with infinte loops.  </description>
+</property>
+
+<property>
+  <name>hive.mapred.reduce.tasks.speculative.execution</name>
+  <value>true</value>
+  <description>Whether speculative execution for reducers should be turned on. </description>
+</property>
+
+</configuration>
diff --git a/examples/src/main/apps/hive/script.q b/examples/src/main/apps/hive/script.q
new file mode 100644
index 000000000..ae05aeee4
--- /dev/null
+++ b/examples/src/main/apps/hive/script.q
@@ -0,0 +1,2 @@
+CREATE EXTERNAL TABLE test (a INT) STORED AS TEXTFILE LOCATION '${INPUT}';
+INSERT OVERWRITE DIRECTORY '${OUTPUT}' SELECT * FROM test;
diff --git a/examples/src/main/apps/hive/workflow.xml b/examples/src/main/apps/hive/workflow.xml
new file mode 100644
index 000000000..26a1205a5
--- /dev/null
+++ b/examples/src/main/apps/hive/workflow.xml
@@ -0,0 +1,48 @@
+<!--
+  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<workflow-app xmlns="uri:oozie:workflow:0.2" name="hive-wf">
+    <start to="hive-node"/>
+
+    <action name="hive-node">
+        <hive xmlns="uri:oozie:hive-action:0.2">
+            <job-tracker>${jobTracker}</job-tracker>
+            <name-node>${nameNode}</name-node>
+            <prepare>
+                <delete path="${nameNode}/user/${wf:user()}/examples/output-data/hive"/>
+                <mkdir path="${nameNode}/user/${wf:user()}/examples/output-data"/>
+            </prepare>
+            <configuration>
+                <property>
+                    <name>mapred.job.queue.name</name>
+                    <value>${queueName}</value>
+                </property>
+                <property>
+                    <name>oozie.hive.defaults</name>
+                    <value>my-hive-default.xml</value>
+                </property>
+            </configuration>
+            <script>script.q</script>
+            <param>INPUT=/user/${wf:user()}/examples/input-data/table</param>
+            <param>OUTPUT=/user/${wf:user()}/examples/output-data/hive</param>
+        </hive>
+        <ok to="end"/>
+        <error to="fail"/>
+    </action>
+
+    <kill name="fail">
+        <message>Hive failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
+    </kill>
+    <end name="end"/>
+</workflow-app>
diff --git a/examples/src/test/java/org/apache/oozie/example/TestLocalOozieExample.java b/examples/src/test/java/org/apache/oozie/example/TestLocalOozieExample.java
index ee0bb38a7..d629f747b 100644
--- a/examples/src/test/java/org/apache/oozie/example/TestLocalOozieExample.java
+++ b/examples/src/test/java/org/apache/oozie/example/TestLocalOozieExample.java
@@ -52,7 +52,7 @@ protected void setUp() throws Exception {
         conf.set("fs.default.name", getNameNodeUri());
         injectKerberosInfo(conf);
 
-// TODO restore this when getting rid of DoAs trick
+        // TODO restore this when getting rid of DoAs trick
 
 //        if (System.getProperty("oozie.test.kerberos", "off").equals("on")) {
 //            Configuration c = new Configuration();
diff --git a/pom.xml b/pom.xml
index 919fcc70f..ace14aec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,23 +78,50 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+
         <repository>
-            <id>central</id>
-            <url>http://repo1.maven.org/maven2</url>
+            <id>Codehaus repository</id>
+            <url>http://repository.codehaus.org/</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
         </repository>
         <repository>
-            <id>Codehaus repository</id>
-            <url>http://repository.codehaus.org/</url>
+            <id>yahoo.github</id>
+            <url>http://yahoo.github.com/maven/repository</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+
+        <repository>
+           <id>datanucleus</id>
+           <url>http://www.datanucleus.org/downloads/maven2</url>
+           <name>Datanucleus</name>
+           <snapshots>
+              <enabled>false</enabled>
+           </snapshots>
+        </repository>
+        <repository>
+           <id>java.net repository</id>
+           <url>http://download.java.net/maven/2</url>
+           <snapshots>
+              <enabled>false</enabled>
+           </snapshots>
+        </repository>
+
+        <repository>
+            <id>cdh.repo</id>
+            <url>https://repository.cloudera.com/content/groups/cloudera-repos</url>
+            <name>Cloudera Repositories</name>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
         </repository>
         <repository>
-            <id>yahoo.github</id>
-            <url>http://yahoo.github.com/maven/repository</url>
+            <id>cdh.snapshots.repo</id>
+            <url>https://repository.cloudera.com/content/repositories/snapshots</url>
+            <name>Cloudera Snapshots Repository</name>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -217,6 +244,12 @@
                 <version>1.2.1</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.4</version>
+            </dependency>
+
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
@@ -224,10 +257,11 @@
             </dependency>
             
             <dependency>
-                <!-- groupId to be correct by GH-0226 -->
-                <groupId>com.yahoo.hadoop</groupId>
+                <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-core</artifactId>
-                <version>0.20.104.2</version>
+
+                <!-- TODO: for now using CDH versions are there are no Apache/Yahoo versions avail -->
+                <version>0.20.2-CDH3B4</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.commons</groupId>
@@ -237,10 +271,11 @@
             </dependency>
 
             <dependency>
-                <!-- groupId to be correct by GH-0226 -->
-                <groupId>com.yahoo.hadoop</groupId>
+                <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-test</artifactId>
-                <version>0.20.104.2</version>
+
+                <!-- TODO: for now using CDH versions are there are no Apache/Yahoo versions avail -->
+                <version>0.20.2-CDH3B4</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.commons</groupId>
@@ -262,10 +297,11 @@
             </dependency>
 
             <dependency>
-                <!-- groupId to be correct by GH-0226 -->
-                <groupId>com.yahoo.hadoop</groupId>
+                <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-streaming</artifactId>
-                <version>0.20.104.2</version>
+
+                <!-- TODO: for now using CDH versions are there are no Apache/Yahoo versions avail -->
+                <version>0.20.2-CDH3B4</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.commons</groupId>
@@ -275,17 +311,12 @@
             </dependency>
 
             <dependency>
-                <!-- groupId to be correct by GH-0226 -->
-                <groupId>com.yahoo.hadoop</groupId>
+                <groupId>org.apache.pig</groupId>
                 <artifactId>pig</artifactId>
-                <version>0.7.0</version>
+
+                <!-- TODO: for now using CDH versions are there are no Apache/Yahoo versions avail -->
+                <version>0.8.0-CDH3B4</version>
                 <exclusions>
-                    <exclusion>
-                        <!-- groupId to be correct by GH-0226 -->
-                        <groupId>com.yahoo.hadoop</groupId>
-                        <artifactId>hadoop-core</artifactId>
-                    </exclusion>
-                    <!-- this exclusion to be removed by GH-0226 -->
                     <exclusion>
                         <groupId>org.apache.hadoop</groupId>
                         <artifactId>hadoop-core</artifactId>
@@ -305,6 +336,18 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.thrift</groupId>
+                <artifactId>thrift</artifactId>
+                <version>0.5.0-cdh</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.hadoop.hive</groupId>
+                <artifactId>hive-cli</artifactId>
+                <version>0.7.0-CDH3B4</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
@@ -478,6 +521,13 @@
                     <!-- Don't change version as doc generation may fail -->
                     <!-- (using custom doxia for twiki pages generation) -->
                     <version>2.0-beta-6</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-module-confluence</artifactId>
+                            <version>1.0-alpha-11</version>
+                       </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -540,6 +590,8 @@
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>
+                    <!-- This switches off DataNucleus enhancer which is ON by default -->
+                    <compilerArgument>-proc:none</compilerArgument>
                 </configuration>
             </plugin>
             <plugin>
@@ -547,7 +599,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkMode>${oozie.test.forkMode}</forkMode>
-                    <argLine>-Xmx1024m</argLine>
+                    <argLine>-Xmx1024m -da</argLine>
                     <systemPropertiesVariables>
                         <hadoop.log.dir>/tmp</hadoop.log.dir>
                     </systemPropertiesVariables>
diff --git a/release-log.txt b/release-log.txt
index fe2e273df..1b4ace6cb 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,7 @@
 -- Oozie 3.0.0 release
 
+GH-0022 Add Hive Action
+GH-0226 Standardize on groupId/artifactId for Hadoop/Pig/Oozie (using CDH artifacts)
 GH-0542 Refactor CoordSuspendXCommand & CoordResumeXCommand to TransitionXCommand based
 GH-0543 Refactor CoordRerunXCommand to TransitionXCommand based
 GH-0530 Update workflow rerun twiki.
diff --git a/sharelib/pom.xml b/sharelib/pom.xml
index b29a76ba2..25d005935 100644
--- a/sharelib/pom.xml
+++ b/sharelib/pom.xml
@@ -39,35 +39,77 @@
 
     <dependencies>
         <dependency>
-            <!-- groupId to be correct by GH-0226 -->
-            <groupId>com.yahoo.hadoop</groupId>
+            <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-streaming</artifactId>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <!-- groupId to be correct by GH-0226 -->
-                    <groupId>com.yahoo.hadoop</groupId>
+                    <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-core</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <!-- groupId to be correct by GH-0226 -->
-            <groupId>com.yahoo.hadoop</groupId>
+            <groupId>org.apache.pig</groupId>
             <artifactId>pig</artifactId>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
-                    <!-- groupId to be correct by GH-0226 -->
-                    <groupId>com.yahoo.hadoop</groupId>
+                    <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.hadoop.hive</groupId>
+            <artifactId>hive-cli</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.hadoop.hive</groupId>
+                    <artifactId>hive-hwi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.hadoop.hive</groupId>
+                    <artifactId>hive-jdbc</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.hadoop.hive</groupId>
+                    <artifactId>hive-anttasks</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/src/main/assemblies/client.xml b/src/main/assemblies/client.xml
index 75aad515d..6e7a8c497 100644
--- a/src/main/assemblies/client.xml
+++ b/src/main/assemblies/client.xml
@@ -53,6 +53,7 @@
             <scope>compile</scope>
             <excludes>
                 <exclude>javax.persistence:persistence-api</exclude>
+                <exclude>*:*:pom</exclude>
             </excludes>
         </dependencySet>
     </dependencySets>
diff --git a/src/main/assemblies/sharelib.xml b/src/main/assemblies/sharelib.xml
index e1a6440c3..86f5b7c85 100644
--- a/src/main/assemblies/sharelib.xml
+++ b/src/main/assemblies/sharelib.xml
@@ -33,6 +33,7 @@
             <unpack>false</unpack>
             <excludes>
                 <exclude>${project.groupId}:oozie-sharelib</exclude>
+                <exclude>*:*:pom</exclude>
             </excludes>
             <useTransitiveDependencies/>
         </dependencySet>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 1ae21fc26..f7f10c503 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -134,7 +134,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>com.yahoo.hadoop</groupId>
+                    <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-core</artifactId>
                     <scope>compile</scope>
                     <exclusions>