From 5658125c1cba9f5742cbf00bf3461077e2b7595d Mon Sep 17 00:00:00 2001
From: Peter MacKinnon <pmackinn@redhat.com>
Date: Mar 21 2014 00:37:32 +0000
Subject: enable full build profile (almost)


---

diff --git a/hive-general-build-mods.patch b/hive-general-build-mods.patch
index cb9936e..d5a3bb4 100644
--- a/hive-general-build-mods.patch
+++ b/hive-general-build-mods.patch
@@ -1,18 +1,3 @@
-diff --git a/build.properties b/build.properties
-index 008d1bb..010bae4 100644
---- a/build.properties
-+++ b/build.properties
-@@ -91,8 +91,8 @@ iterate.hive.nohcat.protobuf=ql
- iterate.hive.nohcat.cpp=odbc
- 
- # core profile
--iterate.hive.core.all=ant,shims,common,serde,metastore,ql,cli
--iterate.hive.core.modules=shims,common,serde,metastore,ql,cli
-+iterate.hive.core.all=ant,shims,common,serde,metastore,ql,service,cli
-+iterate.hive.core.modules=shims,common,serde,metastore,ql,service,cli
- iterate.hive.core.tests=ql
- iterate.hive.core.thrift=ql
- iterate.hive.core.protobuf=ql
 diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
 index d230f2c..44f3a04 100644
 --- a/ivy/ivysettings.xml
diff --git a/hive-hwi-mods.patch b/hive-hwi-mods.patch
new file mode 100644
index 0000000..db7961d
--- /dev/null
+++ b/hive-hwi-mods.patch
@@ -0,0 +1,39 @@
+From 948c12866371a2722265f10303a8fca3b03360e3 Mon Sep 17 00:00:00 2001
+From: Peter MacKinnon <pmackinn@redhat.com>
+Date: Wed, 8 Jan 2014 12:12:35 -0500
+Subject: [PATCH 08/10] hwi mods
+
+---
+ hwi/ivy.xml                                            | 2 +-
+ hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hwi/ivy.xml b/hwi/ivy.xml
+index 81fa89b..aa5435d 100644
+--- a/hwi/ivy.xml
++++ b/hwi/ivy.xml
+@@ -28,7 +28,7 @@
+   <dependencies>
+     <dependency org="org.apache.hive" name="hive-cli" rev="${version}"
+                 conf="compile->default" />
+-    <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" />
++    <dependency org="org.eclipse.jetty" name="jetty-util" rev="${jetty.version}" />
+ 
+     <!-- Test Dependencies -->
+     <dependency org="commons-httpclient" name="commons-httpclient" rev="${commons-httpclient.version}"
+diff --git a/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java b/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java
+index 545f687..d34a7ae 100644
+--- a/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java
++++ b/hwi/src/java/org/apache/hadoop/hive/hwi/HWIServer.java
+@@ -103,7 +103,7 @@ public void start() throws IOException {
+           webServer.join();
+           l4j.debug(" HWI Web Server is started.");
+           break;
+-        } catch (org.mortbay.util.MultiException ex) {
++        } catch (org.eclipse.jetty.util.MultiException ex) {
+           throw ex;
+         }
+       }
+-- 
+1.8.5.2
+
diff --git a/hive.spec b/hive.spec
index b034d37..ebd2388 100644
--- a/hive.spec
+++ b/hive.spec
@@ -6,7 +6,7 @@
 
 Name:          hive
 Version:       0.12.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       The Apache Hadoop data warehouse
 
 License:       ASL 2.0
@@ -21,6 +21,7 @@ Patch3:        %{name}-ql-mods.patch
 Patch4:        %{name}-service-mods.patch
 Patch5:        %{name}-hcatalog-mods.patch
 Patch6:        %{name}-model-enhancer-asm.patch
+Patch7:        %{name}-hwi-mods.patch
 
 BuildRequires: activemq-core
 BuildRequires: activemq-kahadb
@@ -132,6 +133,7 @@ This package contains javadoc for %{name}.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 find -name "*.jar" -delete
 
@@ -165,13 +167,17 @@ sed -i "/<get.*ivy_repo_url.*ivy.jar/d" build.xml
 # missing shebang
 sed -i -e '1d;2i#!/usr/bin/env bash' bin/hive-config.sh
 
+# omit hbase-handler and testutils due to dep issues
+# hcatalog is built separately
+sed -i 's/hbase-handler,testutils,hcatalog//g' build.properties
+
 %build
 
 ARG_BLOCK="
 -Dhadoop.version=%{hadoop_version} -Dhadoop-0.%{hadoop_generation}.version=%{hadoop_version} \
 -Dhadoop.mr.rev=%{hadoop_generation} -Dmvn.hadoop.profile=hadoop%{hadoop_generation} \
 -Dshims.include=0.%{hadoop_generation} \
--Dbuild.profile=core -Dthrift.home=/usr \
+-Dbuild.profile=full -Dthrift.home=/usr \
 -Djline.version=%{jline_version} \
 -Djetty.version=%{jetty_version} \
 "
@@ -189,7 +195,7 @@ ant $ARG_BLOCK package
 
 # before building hcatalog with xmvn, we need to install 
 # its newly created hive deps
-for module in cli common metastore serde service shims; do
+for module in beeline cli common contrib hwi jdbc metastore serde service shims; do
      %mvn_artifact build/$module/pom.xml build/$module/%{name}-$module-%{version}.jar
      xmvn install:install-file -Dfile=build/$module/%{name}-$module-%{version}.jar -DpomFile=build/$module/pom.xml
 done
@@ -290,7 +296,7 @@ rm %{buildroot}%{_datadir}/%{name}/lib/tools-*.jar
 
 # manually replace the hive jars with their links
 rm %{buildroot}%{_datadir}/%{name}/lib/hive-*.jar
-for m in cli common exec metastore serde service shims; do
+for m in beeline cli common contrib exec hwi jdbc metastore serde service shims; do
     ln -s %{_javadir}/%{name}/%{name}-${m}.jar %{buildroot}%{_datadir}/%{name}/lib/%{name}-${m}-%{version}.jar
 done
 
@@ -318,6 +324,9 @@ ln -s `xmvn-resolve org.apache.thrift:libthrift` %{buildroot}%{_datadir}/hadoop/
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Mar 20 2014 Peter MacKinnon <pmackinn@redhat.com> 0.12.0-3
+- enable full build profile (almost)
+
 * Tue Mar 18 2014 Peter MacKinnon <pmackinn@redhat.com> 0.12.0-2
 - reinstate exclude arch arm because of hadoop dep