hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1458549 [2/4] - in /hive/branches/ptf-windowing: ./ ant/src/org/apache/hadoop/hive/ant/ beeline/ beeline/src/ beeline/src/java/ beeline/src/java/org/ beeline/src/java/org/apache/ beeline/src/java/org/apache/hive/ beeline/src/java/org/apach...
Date Tue, 19 Mar 2013 22:37:34 GMT

Propchange: hive/branches/ptf-windowing/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1454766-1458524

Modified: hive/branches/ptf-windowing/.gitignore
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/.gitignore?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/.gitignore (original)
+++ hive/branches/ptf-windowing/.gitignore Tue Mar 19 22:37:16 2013
@@ -8,3 +8,4 @@ build-eclipse
 *.launch
 *~
 metastore_db
+common/src/gen

Modified: hive/branches/ptf-windowing/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java (original)
+++ hive/branches/ptf-windowing/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java Tue Mar 19 22:37:16 2013
@@ -108,6 +108,8 @@ public class QTestGenTask extends Task {
   }
 
   private List<String> templatePaths = new ArrayList<String>();
+
+  private String hiveRootDirectory;
   
   private String outputDirectory;
  
@@ -185,6 +187,18 @@ public class QTestGenTask extends Task {
     return template;
   }
 
+  public void setHiveRootDirectory(File hiveRootDirectory) {
+    try {
+      this.hiveRootDirectory = hiveRootDirectory.getCanonicalPath();
+    } catch (IOException ioe) {
+      throw new BuildException(ioe);
+    }
+  }
+
+  public String getHiveRootDirectory() {
+    return hiveRootDirectory;
+  }
+  
   public void setTemplatePath(String templatePath) throws Exception {
     templatePaths.clear();
     for (String relativePath : templatePath.split(",")) {
@@ -302,14 +316,15 @@ public class QTestGenTask extends Task {
 
     List<File> qFiles = new ArrayList<File>();
     HashMap<String, String> qFilesMap = new HashMap<String, String>();
+    File hiveRootDir = null;
+    File queryDir = null;
     File outDir = null;
     File resultsDir = null;
     File logDir = null;
     
     try {
-      File inpDir = null;
       if (queryDirectory != null) {
-        inpDir = new File(queryDirectory);
+        queryDir = new File(queryDirectory);
       }
 
       if (queryFile != null && !queryFile.equals("")) {
@@ -318,31 +333,37 @@ public class QTestGenTask extends Task {
           if (includeOnly != null && !includeOnly.contains(qFile)) {
             continue;
           }
-          if (null != inpDir) {
-            qFiles.add(new File(inpDir, qFile));
+          if (null != queryDir) {
+            qFiles.add(new File(queryDir, qFile));
           } else {
             qFiles.add(new File(qFile));
           }
         }
       } else if (queryFileRegex != null && !queryFileRegex.equals("")) {
-        qFiles.addAll(Arrays.asList(inpDir.listFiles(
+        qFiles.addAll(Arrays.asList(queryDir.listFiles(
             new QFileRegexFilter(queryFileRegex, includeOnly))));
       } else if (runDisabled != null && runDisabled.equals("true")) {
-        qFiles.addAll(Arrays.asList(inpDir.listFiles(new DisabledQFileFilter(includeOnly))));
+        qFiles.addAll(Arrays.asList(queryDir.listFiles(new DisabledQFileFilter(includeOnly))));
       } else {
-        qFiles.addAll(Arrays.asList(inpDir.listFiles(new QFileFilter(includeOnly))));
+        qFiles.addAll(Arrays.asList(queryDir.listFiles(new QFileFilter(includeOnly))));
       }
 
       if (excludeQueryFile != null && !excludeQueryFile.equals("")) {
         // Exclude specified query files, comma separated
         for (String qFile : excludeQueryFile.split(",")) {
-          if (null != inpDir) {
-            qFiles.remove(new File(inpDir, qFile));
+          if (null != queryDir) {
+            qFiles.remove(new File(queryDir, qFile));
           } else {
             qFiles.remove(new File(qFile));
           }
         }
       }
+
+      hiveRootDir = new File(hiveRootDirectory);
+      if (!hiveRootDir.exists()) {
+        throw new BuildException("Hive Root Directory "
+            + hiveRootDir.getCanonicalPath() + " does not exist");
+      }
       
       Collections.sort(qFiles);
       for (File qFile : qFiles) {
@@ -397,6 +418,8 @@ public class QTestGenTask extends Task {
       // For each of the qFiles generate the test
       VelocityContext ctx = new VelocityContext();
       ctx.put("className", className);
+      ctx.put("hiveRootDir", getEscapedCanonicalPath(hiveRootDir));
+      ctx.put("queryDir", getEscapedCanonicalPath(queryDir));
       ctx.put("qfiles", qFiles);
       ctx.put("qfilesMap", qFilesMap);
       ctx.put("resultsDir", getEscapedCanonicalPath(resultsDir));

Modified: hive/branches/ptf-windowing/bin/ext/beeline.sh
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/bin/ext/beeline.sh?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/bin/ext/beeline.sh (original)
+++ hive/branches/ptf-windowing/bin/ext/beeline.sh Tue Mar 19 22:37:16 2013
@@ -18,13 +18,12 @@ THISSERVICE=beeline
 export SERVICE_LIST="${SERVICE_LIST}${THISSERVICE} "
 
 beeline () {
-
-  CLASS=org.apache.hive.jdbc.beeline.HiveBeeline;
+  CLASS=org.apache.hive.beeline.BeeLine;
   execHiveCmd $CLASS "$@"
 }
 
 beeline_help () {
-  CLASS=org.apache.hive.jdbc.beeline.HiveBeeline;
+  CLASS=org.apache.hive.beeline.BeeLine;
   execHiveCmd $CLASS "--help"
 } 
 

Modified: hive/branches/ptf-windowing/build-common.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/build-common.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/build-common.xml (original)
+++ hive/branches/ptf-windowing/build-common.xml Tue Mar 19 22:37:16 2013
@@ -38,7 +38,9 @@
   <property name="build.classes" location="${build.dir}/classes"/>
   <property name="build.encoding" value="ISO-8859-1"/>
 
+  <!-- Thrift codegen properties -->
   <property name="thrift.args" value="-I ${thrift.home} --gen java:beans,hashcode --gen cpp --gen php --gen py --gen rb"/>
+  <property name="thrift.gen.dir" value="${basedir}/src/gen/thrift"/>
 
   <property name="hadoop.conf.dir" location="${hadoop.root}/conf"/>
 
@@ -77,12 +79,14 @@
       <pathelement location="" />
       <pathelement location="${test.src.data.dir}/conf"/>
       <pathelement location="${hive.conf.dir}"/>
+      <pathelement location="${build.dir.hive}/beeline/test/classes"/>
       <pathelement location="${build.dir.hive}/cli/test/classes"/>
       <pathelement location="${build.dir.hive}/common/test/classes"/>
       <pathelement location="${build.dir.hive}/hbase-handler/test/classes"/>
       <pathelement location="${build.dir.hive}/hwi/test/classes"/>
       <pathelement location="${build.dir.hive}/jdbc/test/classes"/>
       <pathelement location="${build.dir.hive}/metastore/test/classes"/>
+      <pathelement location="${build.dir.hive}/hcatalog/test/classes"/>
       <pathelement location="${build.dir.hive}/ql/test/classes"/>
       <pathelement location="${build.dir.hive}/serde/test/classes"/>
       <pathelement location="${build.dir.hive}/service/test/classes"/>
@@ -97,6 +101,7 @@
       <!-- test directory may contain hadoop jars used by tests only (e.g. mini cluster) -->
       <fileset dir="${hive.root}/build/ivy/lib/test" includes="*.jar" erroronmissingdir="false"
                excludes="**/hive_*.jar,**/hive-*.jar"/>
+      <fileset dir="${hive.root}/build/ivy/lib/test" includes="hive-testutils*.jar" Erroronmissingdir="false"/>
 
       <!-- we strip out hadoop jars present in places other than the hadoop shimmed dir-->
       <fileset dir="${hive.root}/build/ivy/lib/default" includes="*.jar" erroronmissingdir="false"
@@ -181,6 +186,7 @@
     <pathelement location="${build.dir.hive}/classes"/>
     <fileset dir="${build.dir.hive}" includes="*/*.jar"/>
     <fileset dir="${hive.root}/lib" includes="*.jar"/>
+    <fileset dir="${build.ivy.lib.dir}/default" includes="junit*.jar" />
     <fileset dir="${build.ivy.lib.dir}/hadoop0.${hadoop.mr.rev}.shim" includes="*.jar" erroronmissingdir="false" />
     <fileset dir="${build.ivy.lib.dir}/default" includes="*.jar"
              excludes="**/hadoop-*.jar"
@@ -192,7 +198,9 @@
     <pathelement location="${build.dir.hive}/common/classes"/>
     <pathelement location="${build.dir.hive}/serde/classes"/>
     <pathelement location="${build.dir.hive}/metastore/classes"/>
+    <pathelement location="${build.dir.hive}/hcatalog/classes"/>
     <pathelement location="${build.dir.hive}/ql/classes"/>
+    <pathelement location="${build.dir.hive}/beeline/classes"/>
     <pathelement location="${build.dir.hive}/cli/classes"/>
     <pathelement location="${build.dir.hive}/shims/classes"/>
     <pathelement location="${build.dir.hive}/hwi/classes"/>
@@ -226,6 +234,7 @@
     <echo message="Project: ${ant.project.name}"/>
     <mkdir dir="${test.data.dir}"/>
     <mkdir dir="${test.log.dir}/clientpositive"/>
+    <mkdir dir="${test.log.dir}/beelinepositive"/>
     <mkdir dir="${test.log.dir}/clientnegative"/>
     <mkdir dir="${test.log.dir}/positive"/>
     <mkdir dir="${test.log.dir}/negative"/>
@@ -280,7 +289,7 @@
     <javac
      encoding="${build.encoding}"
      srcdir="${test.src.dir}"
-     includes="org/apache/hadoop/**/*.java"
+     includes="org/apache/**/hive/**/*.java"
      excludes="**/TestSerDe.java"
      destdir="${test.build.classes}"
      debug="${javac.debug}"
@@ -295,7 +304,7 @@
     <javac
      encoding="${build.encoding}"
      srcdir="${test.build.src}"
-     includes="org/apache/hadoop/**/*.java"
+     includes="org/apache/**/hive/**/*.java"
      destdir="${test.build.classes}"
      debug="${javac.debug}"
      optimize="${javac.optimize}"
@@ -352,6 +361,12 @@
       </not>
     </condition>
 
+    <condition property="disableserver" value="false">
+      <not>
+        <isset property="disableserver"/>
+      </not>
+    </condition>
+    
     <condition property="clustermode" value="">
       <not>
         <isset property="clustermode"/>
@@ -413,8 +428,10 @@
       </then>
     </if>
     <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no"
-           fork="yes" maxmemory="512m" dir="${basedir}" timeout="${test.junit.timeout}"
+           fork="yes" maxmemory="${test.junit.maxmemory}" dir="${basedir}" timeout="${test.junit.timeout}"
            errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">
+      <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>
+      <jvmarg value="-XX:HeapDumpPath=${hive.root}"/>
       <env key="LANG" value="${test.lang}"/>
       <env key="HIVE_HADOOP_TEST_CLASSPATH" value="${hadoop.testcp}"/>
       <env key="HADOOP_HOME" value="${hadoop.root}"/>
@@ -422,6 +439,7 @@
       <env key="TZ" value="US/Pacific"/>
       <sysproperty key="test.output.overwrite" value="${overwrite}"/>
       <sysproperty key="test.service.standalone.server" value="${standalone}"/>
+      <sysproperty key="test.service.disable.server" value="${disableserver}"/>
       <sysproperty key="log4j.configuration" value="file:///${test.src.data.dir}/conf/hive-log4j.properties"/>
       <sysproperty key="derby.stream.error.file" value="${test.build.dir}/derby.log"/>
       <sysproperty key="hive.aux.jars.path" value="file:///${test.build.dir}/test-udfs.jar"/>
@@ -440,9 +458,11 @@
       <sysproperty key="build.dir.hive" value="${build.dir.hive}"/>
       <sysproperty key="build.ivy.lib.dir" value="${build.ivy.lib.dir}"/>
       <sysproperty key="derby.version" value="${derby.version}"/>
+      <sysproperty key="hive.root" value="${hive.root}"/>
       <sysproperty key="hive.version" value="${version}"/>
       <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}"/>
       <sysproperty key="hadoop.bin.path" value="${test.hadoop.bin.path}${junit.script.extension}"/>
+      <sysproperty key="test.concurrency.num.threads" value="${test.concurrency.num.threads}"/>
       <jvmarg line="${jvm.args}"/>
 
       <classpath refid="test.local.classpath"/>
@@ -450,7 +470,7 @@
       <batchtest todir="${test.build.dir}" unless="testcase">
         <fileset dir="${test.build.classes}"
                  includes="**/${test.include}.class"
-                 excludes="**/TestSerDe.class,**/TestHiveMetaStore.class,**/*$*.class,${test.junit.exclude}" />
+                 excludes="**/TestSerDe.class,**/TestHiveMetaStore.class,**/TestBeeLineDriver.class,**/TestHiveServer2Concurrency.class,**/*$*.class,${test.junit.exclude}" />
       </batchtest>
       <batchtest todir="${test.build.dir}" if="testcase">
         <fileset dir="${test.build.classes}" includes="**/${testcase}.class"/>
@@ -486,6 +506,23 @@
     </condition>
   </target>
 
+  <target name="thriftif" depends="check-thrift-home">
+    <echo message="Project: ${ant.project.name}"/>
+    <delete dir="${thrift.gen.dir}"/>
+    <mkdir dir="${thrift.gen.dir}"/>
+    <for param="thrift.file">
+      <path>
+        <fileset dir="." includes="if/*.thrift,if/test/*.thrift" />
+      </path>
+      <sequential>
+        <echo message="Generating Thrift code for @{thrift.file}"/>
+        <exec executable="${thrift.home}/bin/thrift"  failonerror="true" dir=".">
+          <arg line="${thrift.args} -I ${basedir}/include -I ${basedir}/.. -o ${thrift.gen.dir} @{thrift.file} " />
+        </exec>
+      </sequential>
+    </for>
+  </target>
+  
   <target name="check-ivy" depends="ivy-init-settings">
     <echo message="Project: ${ant.project.name}"/>
     <available file="${basedir}/ivy.xml" property="ivy.present"/>

Modified: hive/branches/ptf-windowing/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/build.properties?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/build.properties (original)
+++ hive/branches/ptf-windowing/build.properties Tue Mar 19 22:37:16 2013
@@ -27,14 +27,14 @@ javac.args=
 javac.args.warnings=
 
 hadoop-0.20.version=0.20.2
-hadoop-0.20S.version=1.0.0
+hadoop-0.20S.version=1.1.2
 hadoop-0.23.version=2.0.0-alpha
 hadoop.version=${hadoop-0.20.version}
 hadoop.security.version=${hadoop-0.20S.version}
 # Used to determine which set of Hadoop artifacts we depend on.
 # - 20: hadoop-core, hadoop-test
 # - 23: hadoop-common, hadoop-mapreduce-*, etc
-hadoop.mr.rev=20
+hadoop.mr.rev=20S
 
 build.dir.hive=${hive.root}/build
 build.dir.hadoop=${build.dir.hive}/hadoopcore
@@ -72,10 +72,10 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ex
 common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
 
 # module names needed for build process
-iterate.hive.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,hwi,hbase-handler,pdk,builtins
-iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,hwi,hbase-handler,pdk,builtins
-iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,odbc,serde,service
-iterate.hive.thrift=ql,service,metastore,serde
+iterate.hive.all=ant,shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils
+iterate.hive.modules=shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils
+iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,hcatalog,odbc,serde,service
+iterate.hive.thrift=ql,service,metastore,hcatalog,serde
 iterate.hive.protobuf=ql
 iterate.hive.cpp=odbc
 
@@ -94,6 +94,16 @@ test.junit.timeout=43200000
 # ant test -Dtest.junit.exclude="**/Test*CliDriver.class,**/TestPartitions.class"
 test.junit.exclude=
 
+test.continue.on.failure=false
+
+test.submodule.exclude=
+test.junit.maxmemory=512m
+
+test.concurrency.num.threads=1
+#test.beelinepositive.exclude=add_part_exist.q,alter1.q,alter2.q,alter4.q,alter5.q,alter_rename_partition.q,alter_rename_partition_authorization.q,archive.q,archive_corrupt.q,archive_multi.q,archive_mr_1806.q,archive_multi_mr_1806.q,authorization_1.q,authorization_2.q,authorization_4.q,authorization_5.q,authorization_6.q,authorization_7.q,ba_table1.q,ba_table2.q,ba_table3.q,ba_table_udfs.q,binary_table_bincolserde.q,binary_table_colserde.q,cluster.q,columnarserde_create_shortcut.q,combine2.q,constant_prop.q,create_nested_type.q,create_or_replace_view.q,create_struct_table.q,create_union_table.q,database.q,database_location.q,database_properties.q,ddltime.q,describe_database_json.q,drop_database_removes_partition_dirs.q,escape1.q,escape2.q,exim_00_nonpart_empty.q,exim_01_nonpart.q,exim_02_00_part_empty.q,exim_02_part.q,exim_03_nonpart_over_compat.q,exim_04_all_part.q,exim_04_evolved_parts.q,exim_05_some_part.q,exim_06_one_part.q,exim_07_all_part_over_nonoverlap.q,exim_08_nonp
 art_rename.q,exim_09_part_spec_nonoverlap.q,exim_10_external_managed.q,exim_11_managed_external.q,exim_12_external_location.q,exim_13_managed_location.q,exim_14_managed_location_over_existing.q,exim_15_external_part.q,exim_16_part_external.q,exim_17_part_managed.q,exim_18_part_external.q,exim_19_00_part_external_location.q,exim_19_part_external_location.q,exim_20_part_managed_location.q,exim_21_export_authsuccess.q,exim_22_import_exist_authsuccess.q,exim_23_import_part_authsuccess.q,exim_24_import_nonexist_authsuccess.q,global_limit.q,groupby_complex_types.q,groupby_complex_types_multi_single_reducer.q,index_auth.q,index_auto.q,index_auto_empty.q,index_bitmap.q,index_bitmap1.q,index_bitmap2.q,index_bitmap3.q,index_bitmap_auto.q,index_bitmap_rc.q,index_compact.q,index_compact_1.q,index_compact_2.q,index_compact_3.q,index_stale_partitioned.q,init_file.q,input16.q,input16_cc.q,input46.q,input_columnarserde.q,input_dynamicserde.q,input_lazyserde.q,input_testxpath3.q,input_testxp
 ath4.q,insert2_overwrite_partitions.q,insertexternal1.q,join_thrift.q,lateral_view.q,load_binary_data.q,load_exist_part_authsuccess.q,load_nonpart_authsuccess.q,load_part_authsuccess.q,loadpart_err.q,lock1.q,lock2.q,lock3.q,lock4.q,merge_dynamic_partition.q,multi_insert.q,multi_insert_move_tasks_share_dependencies.q,null_column.q,ppd_clusterby.q,query_with_semi.q,rename_column.q,sample6.q,sample_islocalmode_hook.q,set_processor_namespaces.q,show_tables.q,source.q,split_sample.q,str_to_map.q,transform1.q,udaf_collect_set.q,udaf_context_ngrams.q,udaf_histogram_numeric.q,udaf_ngrams.q,udaf_percentile_approx.q,udf_array.q,udf_bitmap_and.q,udf_bitmap_or.q,udf_explode.q,udf_format_number.q,udf_map.q,udf_map_keys.q,udf_map_values.q,udf_max.q,udf_min.q,udf_named_struct.q,udf_percentile.q,udf_printf.q,udf_sentences.q,udf_sort_array.q,udf_split.q,udf_struct.q,udf_substr.q,udf_translate.q,udf_union.q,udf_xpath.q,udtf_stack.q,view.q,virtual_column.q
+
+
+
 #
 # Ivy Properties
 #
@@ -108,7 +118,7 @@ ivy.changingPattern=.*SNAPSHOT
 ivy.publish.pattern=[artifact]-[revision].[ext]
 ivy.artifact.retrieve.pattern=[conf]/[artifact]-[revision](-[classifier]).[ext]
 ivysettings.xml=${ivy.conf.dir}/ivysettings.xml
-ivyresolvelog=download-only
+ivyresolvelog=default
 ivy.mvn.repo=http://repo2.maven.org/maven2
 ivy_repo_url=${ivy.mvn.repo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
 hive.ivy.org=org.apache.hive

Modified: hive/branches/ptf-windowing/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/build.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/build.xml (original)
+++ hive/branches/ptf-windowing/build.xml Tue Mar 19 22:37:16 2013
@@ -136,8 +136,10 @@
     <pathelement location="${build.dir.hive}/common/classes"/>
     <pathelement location="${build.dir.hive}/serde/classes"/>
     <pathelement location="${build.dir.hive}/metastore/classes"/>
+    <pathelement location="${build.dir.hive}/hcatalog/classes"/>
     <pathelement location="${build.dir.hive}/ql/classes"/>
     <pathelement location="${build.dir.hive}/cli/classes"/>
+    <pathelement location="${build.dir.hive}/beeline/classes"/>
     <fileset dir="${hive.root}/data" includes="files/*.jar"/>
     <fileset dir="${hive.root}/ql" includes="lib/*.jar"/>
     <fileset dir="${hive.root}/cli" includes="lib/*.jar"/>
@@ -391,16 +393,18 @@
     <mkdir dir="${target.lib.dir}/php"/>
     <copy file="${hive.root}/bin/hive" todir="${target.bin.dir}"/>
     <copy file="${hive.root}/bin/metatool" todir="${target.bin.dir}"/>
+    <copy file="${hive.root}/bin/beeline" todir="${target.bin.dir}"/>
+    <copy file="${hive.root}/bin/hiveserver2" todir="${target.bin.dir}"/>
+    <copy file="${hive.root}/bin/hive-config.sh" todir="${target.bin.dir}"/>
+    <copy todir="${target.bin.dir}/ext">
+      <fileset dir="${hive.root}/bin/ext" excludes="${vcs.excludes}"/>
+    </copy>
     <copy todir="${target.scripts.dir}/metastore/upgrade">
       <fileset dir="${hive.root}/metastore/scripts/upgrade" excludes="${vcs.excludes}"/>
     </copy>
     <copy todir="${target.scripts.dir}/pdk">
       <fileset dir="${hive.root}/pdk/scripts" excludes="${vcs.excludes},README"/>
     </copy>
-    <copy todir="${target.bin.dir}/ext">
-      <fileset dir="${hive.root}/bin/ext" excludes="${vcs.excludes}"/>
-    </copy>
-    <copy file="${hive.root}/bin/hive-config.sh" todir="${target.bin.dir}"/>
     <copy file="${basedir}/conf/hive-default.xml.template" todir="${target.conf.dir}">
       <filterset>
         <filter token="VERSION" value="${version}"/>
@@ -447,6 +451,9 @@
     <copy todir="${target.lib.dir}/py/hive_service">
       <fileset dir="${hive.root}/service/src/gen/thrift/gen-py/hive_service" excludes="${vcs.excludes}"/>
     </copy>
+    <copy todir="${target.lib.dir}/py/TCLIService">
+      <fileset dir="${hive.root}/service/src/gen/thrift/gen-py/TCLIService" excludes="${vcs.excludes}"/>
+    </copy>
     <copy todir="${target.lib.dir}/py/queryplan">
       <fileset dir="${hive.root}/ql/src/gen/thrift/gen-py/queryplan" excludes="${vcs.excludes}"/>
     </copy>
@@ -460,14 +467,16 @@
         <exclude name="build/hadoopcore/*.jar"/>
         <exclude name="**/ant-contrib*.jar"/>
         <exclude name="**/hive-anttasks*.jar"/>
+        <exclude name="**/hive-testutils*.jar"/>
       </fileset>
+      <fileset file="${build.dir.hive}/beeline/hive-beeline-${version}.jar"/>
       <fileset file="${build.dir.hive}/cli/hive-cli-${version}.jar"/>
       <fileset file="${build.dir.hive}/common/hive-common-${version}.jar"/>
       <fileset file="${build.dir.hive}/ql/hive-exec-${version}.jar"/>
       <fileset file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"/>
+      <fileset file="${build.dir.hive}/hcatalog/hive-hcatalog-${version}.jar"/>
       <fileset file="${build.dir.hive}/hwi/hive-hwi-${version}.war"/>
       <fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"/>
-      <fileset file="${build.dir.hive}/contrib/hive-hbase_handler-${version}.jar"/>
       <fileset dir="${build.dir.hive}/ivy/lib/default">
         <include name="*.jar"/>
         <exclude name="*.tar.gz"/>
@@ -659,7 +668,9 @@
       <packageset dir="metastore/src/test"/>
       <packageset dir="metastore/src/gen/thrift/gen-javabean"/>
       <packageset dir="metastore/src/model"/>
+      <packageset dir="hcatalog/src/java"/>
       <packageset dir="cli/src/java"/>
+      <packageset dir="beeline/src/java"/>
       <packageset dir="ql/src/java"/>
       <packageset dir="ql/src/test"/>
       <packageset dir="ql/src/gen/thrift/gen-javabean"/>
@@ -884,89 +895,93 @@
     </available>
   </target>
 
-	<!-- ================================================================== -->
-	<!-- Findbugs                                                         -->
-	<!-- ================================================================== -->
-
-
-	<target name="ivy-resolve-findbugs" depends="ivy-init-settings">
-		<echo message="Project: ${ant.project.name}" />
-		<ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="findbugs" log="${ivyresolvelog}" />
-	</target>
-
-	<property name="ivy.findbugs.retrieve.pattern" value="[conf]/[artifact].[ext]" />
-
-	<target name="ivy-retrieve-findbugs" depends="ivy-resolve-findbugs" description="Retrieve Ivy-managed artifacts for the checkstyle configurations">
-		<echo message="Project: ${ant.project.name}" />
-		<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings" pattern="${build.ivy.lib.dir}/${ivy.findbugs.retrieve.pattern}" log="${ivyresolvelog}" />
-	</target>
-
-	<target name="check-for-findbugs">
-		<echo message="Project: ${ant.project.name}" />
-		<path id="findbugs.classpath">
-			<fileset dir="${build.ivy.lib.dir}/findbugs">
-				<include name="*.jar" />
-			</fileset>
-		</path>
-		<pathconvert property="findbugs.classpath" refid="findbugs.classpath" />
-	</target>
-
-	<target name="findbugs" depends="init,ivy-retrieve-findbugs,check-for-findbugs" description="Run findbugs on source files">
-		<echo message="Project: ${ant.project.name}" />
-        
-        <property name="findbugs.conf.dir" location="${hive.root}/findbugs" />
-        <property name="findbugs.build.dir" location="${build.dir.hive}/findbugs" />
-        <property name="findbugs.exclude.file" value="${findbugs.conf.dir}/findbugs-exclude.xml"/>
-        <property name="findbugs.report.htmlfile" value="${findbugs.build.dir}/findbugs-report.html"/>
-        <property name="findbugs.report.xmlfile" value="${findbugs.build.dir}/findbugs-report.xml"/>
-        
-		<mkdir dir="${findbugs.build.dir}" />
-		<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${build.ivy.lib.dir}/findbugs/findbugs-ant.jar" />
-
-		<findbugs classpath="${findbugs.classpath}" pluginList="" effort="max" output="xml" outputFile="${findbugs.report.xmlfile}" excludeFilter="${findbugs.exclude.file}">
-		 
-            <auxClasspath>
-				<fileset dir="${build.dir.hive}">
-					<include name="**/*.jar" />
-				</fileset>
-			</auxClasspath>
-            
-			<sourcePath path="${hive.root}/ant" />
-			<sourcePath path="${hive.root}/builtins" />
-            <sourcePath path="${hive.root}/cli" />
-			<sourcePath path="${hive.root}/common" />
-			<sourcePath path="${hive.root}/contrib" />
-			<sourcePath path="${hive.root}/hbase-handler" />
-			<sourcePath path="${hive.root}/hwi" />
-			<sourcePath path="${hive.root}/jdbc" />
-			<sourcePath path="${hive.root}/metastore" />
-			<sourcePath path="${hive.root}/odbc" />
-			<sourcePath path="${hive.root}/pdk" />
-            <sourcePath path="${hive.root}/ql" />
-			<sourcePath path="${hive.root}/serde" />
-			<sourcePath path="${hive.root}/service" />
-			<sourcePath path="${hive.root}/shims" />
-			<class location="${build.dir.hive}/anttasks/classes" />
-            <class location="${build.dir.hive}/builtins/classes" />
-            <class location="${build.dir.hive}/cli/classes" />
-			<class location="${build.dir.hive}/common/classes" />
-			<class location="${build.dir.hive}/contrib/classes" />
-            <class location="${build.dir.hive}/hbase-handler/classes" />
-			<class location="${build.dir.hive}/hwi/classes" />
-            <class location="${build.dir.hive}/jdbc/classes" />
-			<class location="${build.dir.hive}/metastore/classes" />
-            <class location="${build.dir.hive}/pdk/classes" />
-			<class location="${build.dir.hive}/ql/classes" />
-            <class location="${build.dir.hive}/serde/classes" />
-			<class location="${build.dir.hive}/service/classes" />
-            <class location="${build.dir.hive}/shims/classes" />
-		</findbugs>
-        <!--
+  <!-- ================================================================== -->
+  <!-- Findbugs                                                         -->
+  <!-- ================================================================== -->
+  
+
+  <target name="ivy-resolve-findbugs" depends="ivy-init-settings">
+    <echo message="Project: ${ant.project.name}" />
+    <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="findbugs" log="${ivyresolvelog}" />
+  </target>
+  
+  <property name="ivy.findbugs.retrieve.pattern" value="[conf]/[artifact].[ext]" />
+  
+  <target name="ivy-retrieve-findbugs" depends="ivy-resolve-findbugs" description="Retrieve Ivy-managed artifacts for the checkstyle configurations">
+    <echo message="Project: ${ant.project.name}" />
+    <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings" pattern="${build.ivy.lib.dir}/${ivy.findbugs.retrieve.pattern}" log="${ivyresolvelog}" />
+  </target>
+  
+  <target name="check-for-findbugs">
+    <echo message="Project: ${ant.project.name}" />
+    <path id="findbugs.classpath">
+      <fileset dir="${build.ivy.lib.dir}/findbugs">
+	<include name="*.jar" />
+      </fileset>
+    </path>
+    <pathconvert property="findbugs.classpath" refid="findbugs.classpath" />
+  </target>
+  
+  <target name="findbugs" depends="init,ivy-retrieve-findbugs,check-for-findbugs" description="Run findbugs on source files">
+    <echo message="Project: ${ant.project.name}" />
+    
+    <property name="findbugs.conf.dir" location="${hive.root}/findbugs" />
+    <property name="findbugs.build.dir" location="${build.dir.hive}/findbugs" />
+    <property name="findbugs.exclude.file" value="${findbugs.conf.dir}/findbugs-exclude.xml"/>
+    <property name="findbugs.report.htmlfile" value="${findbugs.build.dir}/findbugs-report.html"/>
+    <property name="findbugs.report.xmlfile" value="${findbugs.build.dir}/findbugs-report.xml"/>
+    
+    <mkdir dir="${findbugs.build.dir}" />
+    <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${build.ivy.lib.dir}/findbugs/findbugs-ant.jar" />
+    
+    <findbugs classpath="${findbugs.classpath}" pluginList="" effort="max" output="xml" outputFile="${findbugs.report.xmlfile}" excludeFilter="${findbugs.exclude.file}">
+      
+      <auxClasspath>
+	<fileset dir="${build.dir.hive}">
+	  <include name="**/*.jar" />
+	</fileset>
+      </auxClasspath>
+      
+      <sourcePath path="${hive.root}/ant" />
+      <sourcePath path="${hive.root}/beeline" />
+      <sourcePath path="${hive.root}/builtins" />
+      <sourcePath path="${hive.root}/cli" />
+      <sourcePath path="${hive.root}/common" />
+      <sourcePath path="${hive.root}/contrib" />
+      <sourcePath path="${hive.root}/hbase-handler" />
+      <sourcePath path="${hive.root}/hwi" />
+      <sourcePath path="${hive.root}/jdbc" />
+      <sourcePath path="${hive.root}/metastore" />
+      <sourcePath path="${hive.root}/hcatalog" />
+      <sourcePath path="${hive.root}/odbc" />
+      <sourcePath path="${hive.root}/pdk" />
+      <sourcePath path="${hive.root}/ql" />
+      <sourcePath path="${hive.root}/serde" />
+      <sourcePath path="${hive.root}/service" />
+      <sourcePath path="${hive.root}/shims" />
+      <class location="${build.dir.hive}/anttasks/classes" />
+      <class location="${build.dir.hive}/beeline/classes" />
+      <class location="${build.dir.hive}/builtins/classes" />
+      <class location="${build.dir.hive}/cli/classes" />
+      <class location="${build.dir.hive}/common/classes" />
+      <class location="${build.dir.hive}/contrib/classes" />
+      <class location="${build.dir.hive}/hbase-handler/classes" />
+      <class location="${build.dir.hive}/hwi/classes" />
+      <class location="${build.dir.hive}/jdbc/classes" />
+      <class location="${build.dir.hive}/metastore/classes" />
+      <class location="${build.dir.hive}/hcatalog/classes" />
+      <class location="${build.dir.hive}/pdk/classes" />
+      <class location="${build.dir.hive}/ql/classes" />
+      <class location="${build.dir.hive}/serde/classes" />
+      <class location="${build.dir.hive}/service/classes" />
+      <class location="${build.dir.hive}/shims/classes" />
+    </findbugs>
+    <!--
         <xslt style="${findbugs.conf.dir}/default.xsl" in="${findbugs.report.xmlfile}"  out="${findbugs.report.htmlfile}"/>
         -->
-	</target>
+  </target>
   <target name="ivy-docs" depends="ivy-init-settings"
-    description="Resolve, Retrieve Ivy-managed artifacts for docs configuration">
+          description="Resolve, Retrieve Ivy-managed artifacts for docs configuration">
     <echo message="Project: ${ant.project.name}"/>
     <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="docs"/>
     <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
@@ -1038,6 +1053,10 @@
     <!-- copy the jars  -->
     <copy file="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar"
           todir="${mvn.jar.dir}" />
+    <copy file="${build.dir.hive}/beeline/hive-beeline-${version}.jar"
+          todir="${mvn.jar.dir}" />
+    <copy file="${build.dir.hive}/builtins/hive-builtins-${version}.jar"
+          todir="${mvn.jar.dir}" />
     <copy file="${build.dir.hive}/cli/hive-cli-${version}.jar"
           todir="${mvn.jar.dir}" />
     <copy file="${build.dir.hive}/common/hive-common-${version}.jar"
@@ -1052,6 +1071,10 @@
           todir="${mvn.jar.dir}" />
     <copy file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"
           todir="${mvn.jar.dir}" />
+    <copy file="${build.dir.hive}/hcatalog/hive-hcatalog-${version}.jar"
+          todir="${mvn.jar.dir}" />
+    <copy file="${build.dir.hive}/pdk/hive-pdk-${version}.jar"
+          todir="${mvn.jar.dir}" />
     <copy file="${build.dir.hive}/ql/hive-exec-${version}.jar"
           todir="${mvn.jar.dir}" />
     <copy file="${build.dir.hive}/serde/hive-serde-${version}.jar"
@@ -1060,14 +1083,14 @@
           todir="${mvn.jar.dir}" />
     <copy file="${build.dir.hive}/shims/hive-shims-${version}.jar"
           todir="${mvn.jar.dir}" />
-    <copy file="${build.dir.hive}/pdk/hive-pdk-${version}.jar"
-          todir="${mvn.jar.dir}" />
-    <copy file="${build.dir.hive}/builtins/hive-builtins-${version}.jar"
-          todir="${mvn.jar.dir}" />
 
     <!-- copy over maven pom files created using the make-pom target and rename to maven convention -->
     <copy file="${build.dir.hive}/anttasks/pom.xml"
           tofile="${mvn.pom.dir}/hive-anttasks-${version}.pom" />
+    <copy file="${build.dir.hive}/beeline/pom.xml"
+          tofile="${mvn.pom.dir}/hive-beeline-${version}.pom" />
+    <copy file="${build.dir.hive}/builtins/pom.xml"
+          tofile="${mvn.pom.dir}/hive-builtins-${version}.pom" />
     <copy file="${build.dir.hive}/cli/pom.xml"
           tofile="${mvn.pom.dir}/hive-cli-${version}.pom" />
     <copy file="${build.dir.hive}/common/pom.xml"
@@ -1082,6 +1105,10 @@
           tofile="${mvn.pom.dir}/hive-jdbc-${version}.pom" />
     <copy file="${build.dir.hive}/metastore/pom.xml"
           tofile="${mvn.pom.dir}/hive-metastore-${version}.pom" />
+    <copy file="${build.dir.hive}/hcatalog/pom.xml"
+          tofile="${mvn.pom.dir}/hive-hcatalog-${version}.pom" />
+    <copy file="${build.dir.hive}/pdk/pom.xml"
+          tofile="${mvn.pom.dir}/hive-pdk-${version}.pom" />
     <copy file="${build.dir.hive}/ql/pom.xml"
           tofile="${mvn.pom.dir}/hive-exec-${version}.pom" />
     <copy file="${build.dir.hive}/serde/pom.xml"
@@ -1090,10 +1117,8 @@
           tofile="${mvn.pom.dir}/hive-service-${version}.pom" />
     <copy file="${build.dir.hive}/shims/pom.xml"
           tofile="${mvn.pom.dir}/hive-shims-${version}.pom" />
-    <copy file="${build.dir.hive}/pdk/pom.xml"
-          tofile="${mvn.pom.dir}/hive-pdk-${version}.pom" />
-    <copy file="${build.dir.hive}/builtins/pom.xml"
-          tofile="${mvn.pom.dir}/hive-builtins-${version}.pom" />
+
+
 
     <!-- copy over licence -->
     <copy file="${hive.root}/LICENSE" todir="${mvn.license.dir}" />
@@ -1169,6 +1194,12 @@
       <param name="hive.project" value="anttasks" />
     </antcall>
     <antcall target="maven-publish-artifact">
+      <param name="hive.project" value="beeline" />
+    </antcall>
+    <antcall target="maven-publish-artifact">
+      <param name="hive.project" value="builtins" />
+    </antcall>
+    <antcall target="maven-publish-artifact">
       <param name="hive.project" value="cli" />
     </antcall>
     <antcall target="maven-publish-artifact">
@@ -1187,16 +1218,16 @@
       <param name="hive.project" value="hwi" />
     </antcall>
     <antcall target="maven-publish-artifact">
-      <param name="hive.project" value="pdk" />
+      <param name="hive.project" value="jdbc" />
     </antcall>
     <antcall target="maven-publish-artifact">
-      <param name="hive.project" value="builtins" />
+      <param name="hive.project" value="metastore" />
     </antcall>
     <antcall target="maven-publish-artifact">
-      <param name="hive.project" value="jdbc" />
+      <param name="hive.project" value="hcatalog" />
     </antcall>
     <antcall target="maven-publish-artifact">
-      <param name="hive.project" value="metastore" />
+      <param name="hive.project" value="pdk" />
     </antcall>
     <antcall target="maven-publish-artifact">
       <param name="hive.project" value="serde" />
@@ -1231,6 +1262,8 @@
         </exec>
       </sequential>
     </macrodef>
+
+    <!-- hive-anttasks -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-anttasks-${version}.jar"
         output.file="${mvn.jar.dir}/hive-anttasks-${version}.jar.asc"
@@ -1239,6 +1272,18 @@
         input.file="${mvn.pom.dir}/hive-anttasks-${version}.pom"
         output.file="${mvn.pom.dir}/hive-anttasks-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-beeline -->
+    <sign-artifact
+        input.file="${mvn.jar.dir}/hive-beeline-${version}.jar"
+        output.file="${mvn.jar.dir}/hive-beeline-${version}.jar.asc"
+        gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact
+        input.file="${mvn.pom.dir}/hive-beeline-${version}.pom"
+        output.file="${mvn.pom.dir}/hive-beeline-${version}.pom.asc"
+        gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-cli -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-cli-${version}.jar"
         output.file="${mvn.jar.dir}/hive-cli-${version}.jar.asc"
@@ -1247,6 +1292,8 @@
         input.file="${mvn.pom.dir}/hive-cli-${version}.pom"
         output.file="${mvn.pom.dir}/hive-cli-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-common -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-common-${version}.jar"
         output.file="${mvn.jar.dir}/hive-common-${version}.jar.asc"
@@ -1255,6 +1302,8 @@
         input.file="${mvn.pom.dir}/hive-common-${version}.pom"
         output.file="${mvn.pom.dir}/hive-common-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-contrib -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-contrib-${version}.jar"
         output.file="${mvn.jar.dir}/hive-contrib-${version}.jar.asc"
@@ -1263,6 +1312,18 @@
         input.file="${mvn.pom.dir}/hive-contrib-${version}.pom"
         output.file="${mvn.pom.dir}/hive-contrib-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-exec -->
+    <sign-artifact
+        input.file="${mvn.jar.dir}/hive-exec-${version}.jar"
+        output.file="${mvn.jar.dir}/hive-exec-${version}.jar.asc"
+        gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact
+        input.file="${mvn.pom.dir}/hive-exec-${version}.pom"
+        output.file="${mvn.pom.dir}/hive-exec-${version}.pom.asc"
+        gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-hbase-handler -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-hbase-handler-${version}.jar"
         output.file="${mvn.jar.dir}/hive-hbase-handler-${version}.jar.asc"
@@ -1271,6 +1332,8 @@
         input.file="${mvn.pom.dir}/hive-hbase-handler-${version}.pom"
         output.file="${mvn.pom.dir}/hive-hbase-handler-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-hwi -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-hwi-${version}.jar"
         output.file="${mvn.jar.dir}/hive-hwi-${version}.jar.asc"
@@ -1279,6 +1342,8 @@
         input.file="${mvn.pom.dir}/hive-hwi-${version}.pom"
         output.file="${mvn.pom.dir}/hive-hwi-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-jdbc -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-jdbc-${version}.jar"
         output.file="${mvn.jar.dir}/hive-jdbc-${version}.jar.asc"
@@ -1287,38 +1352,38 @@
         input.file="${mvn.pom.dir}/hive-jdbc-${version}.pom"
         output.file="${mvn.pom.dir}/hive-jdbc-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-metastore -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-metastore-${version}.jar"
         output.file="${mvn.jar.dir}/hive-metastore-${version}.jar.asc"
         gpg.passphrase="${gpg.passphrase}"/>
     <sign-artifact
-        input.file="${mvn.pom.dir}/hive-metastore-${version}.pom"
-        output.file="${mvn.pom.dir}/hive-metastore-${version}.pom.asc"
+        input.file="${mvn.jar.dir}/hive-metastore-${version}.pom"
+        output.file="${mvn.jar.dir}/hive-metastore-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-hcatalog -->
     <sign-artifact
-        input.file="${mvn.jar.dir}/hive-exec-${version}.jar"
-        output.file="${mvn.jar.dir}/hive-exec-${version}.jar.asc"
+        input.file="${mvn.pom.dir}/hive-hcatalog-${version}.jar"
+        output.file="${mvn.pom.dir}/hive-hcatalog-${version}.jar.asc"
         gpg.passphrase="${gpg.passphrase}"/>
     <sign-artifact
-        input.file="${mvn.pom.dir}/hive-exec-${version}.pom"
-        output.file="${mvn.pom.dir}/hive-exec-${version}.pom.asc"
+        input.file="${mvn.pom.dir}/hive-hcatalog-${version}.pom"
+        output.file="${mvn.pom.dir}/hive-hcatalog-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-pdk -->
     <sign-artifact
-        input.file="${mvn.jar.dir}/hive-pdk-${version}.jar"
-        output.file="${mvn.jar.dir}/hive-pdk-${version}.jar.asc"
+        input.file="${mvn.pom.dir}/hive-pdk-${version}.jar"
+        output.file="${mvn.pom.dir}/hive-pdk-${version}.jar.asc"
         gpg.passphrase="${gpg.passphrase}"/>
     <sign-artifact
         input.file="${mvn.pom.dir}/hive-pdk-${version}.pom"
         output.file="${mvn.pom.dir}/hive-pdk-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact
-        input.file="${mvn.jar.dir}/hive-builtins-${version}.jar"
-        output.file="${mvn.jar.dir}/hive-builtins-${version}.jar.asc"
-        gpg.passphrase="${gpg.passphrase}"/>
-    <sign-artifact
-        input.file="${mvn.pom.dir}/hive-builtins-${version}.pom"
-        output.file="${mvn.pom.dir}/hive-builtins-${version}.pom.asc"
-        gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-serde -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-serde-${version}.jar"
         output.file="${mvn.jar.dir}/hive-serde-${version}.jar.asc"
@@ -1327,6 +1392,8 @@
         input.file="${mvn.pom.dir}/hive-serde-${version}.pom"
         output.file="${mvn.pom.dir}/hive-serde-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-service -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-service-${version}.jar"
         output.file="${mvn.jar.dir}/hive-service-${version}.jar.asc"
@@ -1335,6 +1402,8 @@
         input.file="${mvn.pom.dir}/hive-service-${version}.pom"
         output.file="${mvn.pom.dir}/hive-service-${version}.pom.asc"
         gpg.passphrase="${gpg.passphrase}"/>
+
+    <!-- hive-shims -->
     <sign-artifact
         input.file="${mvn.jar.dir}/hive-shims-${version}.jar"
         output.file="${mvn.jar.dir}/hive-shims-${version}.jar.asc"

Modified: hive/branches/ptf-windowing/builtins/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/builtins/ivy.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/builtins/ivy.xml (original)
+++ hive/branches/ptf-windowing/builtins/ivy.xml Tue Mar 19 22:37:16 2013
@@ -27,8 +27,6 @@
     <include file="${ivy.conf.dir}/common-configurations.xml"/>
   </configurations>
   <dependencies>
-    <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
-                conf="compile->default" />
     <dependency org="org.apache.hive" name="hive-pdk" rev="${version}"
                 conf="compile->default" transitive="false" />
 

Modified: hive/branches/ptf-windowing/cli/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/cli/build.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/cli/build.xml (original)
+++ hive/branches/ptf-windowing/cli/build.xml Tue Mar 19 22:37:16 2013
@@ -40,6 +40,11 @@ to call at top-level: ant deploy-contrib
       <compilerarg line="${javac.args} ${javac.args.warnings}" />
       <classpath refid="classpath"/>
     </javac>
+    <copy todir="${build.classes}" failonerror="false">
+      <fileset dir="${src.dir}">
+        <include name="**/*.properties"/>
+      </fileset>
+    </copy>
   </target>
 
 </project>

Modified: hive/branches/ptf-windowing/cli/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/cli/ivy.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/cli/ivy.xml (original)
+++ hive/branches/ptf-windowing/cli/ivy.xml Tue Mar 19 22:37:16 2013
@@ -29,28 +29,13 @@
   <dependencies>
     <!-- Runtime Dependencies -->
 
-    <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
-    <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
-    <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
-                transitive="false"/>
-    <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
-                transitive="false"/>
     <dependency org="jline" name="jline" rev="${jline.version}"
                 transitive="false"/>
-    <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
-                transitive="false"/>
-
     <dependency org="org.apache.hive" name="hive-service" rev="${version}"
                 conf="compile->default" />
     <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
                 conf="runtime" transitive="false"/>
     <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
                 conf="runtime" transitive="false"/>
-    
-    <!-- Test Dependencies -->
-    <dependency org="junit" name="junit"
-                rev="${junit.version}" conf="test->default" />
-    <dependency org="org.mockito" name="mockito-all"
-                rev="${mockito-all.version}" conf="test->default" />
   </dependencies>
 </ivy-module>

Modified: hive/branches/ptf-windowing/common/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/common/build.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/common/build.xml (original)
+++ hive/branches/ptf-windowing/common/build.xml Tue Mar 19 22:37:16 2013
@@ -29,6 +29,11 @@ to call at top-level: ant deploy-contrib
 
   <target name="compile" depends="init, setup, ivy-retrieve">
     <echo message="Project: ${ant.project.name}"/>
+    <exec executable="bash" failonerror="true">
+      <arg value="${basedir}/src/scripts/saveVersion.sh"/>
+      <arg value="${version}"/>
+      <arg value="${basedir}/src"/>
+    </exec>
     <javac
      encoding="${build.encoding}"
      srcdir="${src.dir}"

Modified: hive/branches/ptf-windowing/common/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/common/ivy.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/common/ivy.xml (original)
+++ hive/branches/ptf-windowing/common/ivy.xml Tue Mar 19 22:37:16 2013
@@ -27,13 +27,6 @@
     <include file="${ivy.conf.dir}/common-configurations.xml"/>
   </configurations>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-common"
-                rev="${hadoop-0.23.version}"
-                conf="hadoop23.compile->default" transitive="false">
-      <include type="jar"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
     <dependency org="org.apache.hadoop" name="hadoop-auth"
                 rev="${hadoop-0.23.version}"
                 conf="hadoop23.compile->default" transitive="false">
@@ -41,55 +34,14 @@
       <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
       <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
     </dependency>
-    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
-                rev="${hadoop-0.23.version}"
-                conf="hadoop23.compile->default" transitive="false">
-      <include type="jar"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
-    <dependency org="org.apache.hadoop" name="hadoop-archives"
-                rev="${hadoop-0.23.version}"
-                conf="hadoop23.compile->default" transitive="false">
-      <include type="jar"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
     <dependency org="org.apache.avro" name="avro" rev="${avro.version}"
                 conf="hadoop23.compile->default" transitive="false" />
 
-    <dependency org="org.apache.hadoop" name="hadoop-core"
-                rev="${hadoop-0.20.version}"
-                conf="hadoop20.compile->default" transitive="false">
-      <include type="jar"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
-
-    <dependency org="org.apache.hadoop" name="hadoop-test"
-                rev="${hadoop-0.20.version}"
-                conf="hadoop20.compile->default" transitive="false">
-      <include type="jar"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
-    <dependency org="org.apache.hadoop" name="hadoop-tools"
-                rev="${hadoop-0.20.version}"
-                conf="hadoop20.compile->default" transitive="false">
-      <include type="jar"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
-
     <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
                 conf="compile->default" transitive="false" />
     <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
     <dependency org="org.apache.commons" name="commons-compress" rev="${commons-compress.version}"/>
     <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
-    <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
-                transitive="false"/>
-    <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
-                transitive="false"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}"
                 transitive="false"/>
   </dependencies>

Modified: hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/common/metrics/Metrics.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/common/metrics/Metrics.java?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/common/metrics/Metrics.java (original)
+++ hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/common/metrics/Metrics.java Tue Mar 19 22:37:16 2013
@@ -72,6 +72,14 @@ public class Metrics {
       open();
     }
 
+    public Long getNumCounter() throws IOException {
+      return (Long)Metrics.get(numCounter);
+    }
+
+    public Long getTimeCounter() throws IOException {
+      return (Long)Metrics.get(timeCounter);
+    }
+
     /**
      * Opens scope, and makes note of the time started, increments run counter
      * @throws IOException

Modified: hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/ptf-windowing/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Tue Mar 19 22:37:16 2013
@@ -24,8 +24,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
@@ -57,6 +59,7 @@ public class HiveConf extends Configurat
   private static byte[] confVarByteArray = null;
 
   private static final Map<String, ConfVars> vars = new HashMap<String, ConfVars>();
+  private final List<String> restrictList = new ArrayList<String>();
 
   static {
     ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
@@ -146,6 +149,16 @@ public class HiveConf extends Configurat
   };
 
   /**
+   * The conf variables that depends on current user
+   */
+  public static final HiveConf.ConfVars[] userVars = {
+    HiveConf.ConfVars.SCRATCHDIR,
+    HiveConf.ConfVars.LOCALSCRATCHDIR,
+    HiveConf.ConfVars.DOWNLOADED_RESOURCES_DIR,
+    HiveConf.ConfVars.HIVEHISTORYFILELOC
+  };
+
+  /**
    * ConfVars.
    *
    * These are the default configuration properties for Hive. Each HiveConf
@@ -688,6 +701,24 @@ public class HiveConf extends Configurat
     HIVE_DDL_OUTPUT_FORMAT("hive.ddl.output.format", null),
     HIVE_ENTITY_SEPARATOR("hive.entity.separator", "@"),
 
+    HIVE_SERVER2_THRIFT_MIN_WORKER_THREADS("hive.server2.thrift.min.worker.threads", 5),
+    HIVE_SERVER2_THRIFT_MAX_WORKER_THREADS("hive.server2.thrift.max.worker.threads", 100),
+
+    HIVE_SERVER2_THRIFT_PORT("hive.server2.thrift.port", 10000),
+    HIVE_SERVER2_THRIFT_BIND_HOST("hive.server2.thrift.bind.host", ""),
+
+
+    // HiveServer2 auth configuration
+    HIVE_SERVER2_AUTHENTICATION("hive.server2.authentication", "NONE"),
+    HIVE_SERVER2_KERBEROS_KEYTAB("hive.server2.authentication.kerberos.keytab", ""),
+    HIVE_SERVER2_KERBEROS_PRINCIPAL("hive.server2.authentication.kerberos.principal", ""),
+    HIVE_SERVER2_PLAIN_LDAP_URL("hive.server2.authentication.ldap.url", null),
+    HIVE_SERVER2_PLAIN_LDAP_BASEDN("hive.server2.authentication.ldap.baseDN", null),
+    HIVE_SERVER2_KERBEROS_IMPERSONATION("hive.server2.enable.impersonation", false),
+    HIVE_SERVER2_CUSTOM_AUTHENTICATION_CLASS("hive.server2.custom.authentication.class", null),
+
+    HIVE_CONF_RESTRICTED_LIST("hive.conf.restricted.list", null),
+
     // If this is set all move tasks at the end of a multi-insert query will only begin once all
     // outputs are ready
     HIVE_MULTI_INSERT_MOVE_TASKS_SHARE_DEPENDENCIES(
@@ -876,6 +907,13 @@ public class HiveConf extends Configurat
     return new LoopingByteArrayInputStream(confVarByteArray);
   }
 
+  public void verifyAndSet(String name, String value) throws IllegalArgumentException {
+    if (restrictList.contains(name)) {
+      throw new IllegalArgumentException("Cann't modify " + name + " at runtime");
+    }
+    set(name, value);
+  }
+
   public static int getIntVar(Configuration conf, ConfVars var) {
     assert (var.valClass == Integer.class);
     return conf.getInt(var.varname, var.defaultIntVal);
@@ -1063,8 +1101,18 @@ public class HiveConf extends Configurat
     if (auxJars == null) {
       auxJars = this.get(ConfVars.HIVEAUXJARS.varname);
     }
+
+    // setup list of conf vars that are not allowed to change runtime
+    String restrictListStr = this.get(ConfVars.HIVE_CONF_RESTRICTED_LIST.toString());
+    if (restrictListStr != null) {
+      for (String entry : restrictListStr.split(",")) {
+        restrictList.add(entry);
+      }
+    }
+    restrictList.add(ConfVars.HIVE_CONF_RESTRICTED_LIST.toString());
   }
 
+
   /**
    * Apply system properties to this object if the property name is defined in ConfVars
    * and the value is non-null and not an empty string.

Modified: hive/branches/ptf-windowing/conf/hive-default.xml.template
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/conf/hive-default.xml.template?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/conf/hive-default.xml.template (original)
+++ hive/branches/ptf-windowing/conf/hive-default.xml.template Tue Mar 19 22:37:16 2013
@@ -1120,7 +1120,7 @@
 <property>
   <name>hive.profiler.retries.wait</name>
   <value>3000</value>
-  <description>The base waiting window (in milliseconds) before the next retry. The actual wait time is calculated by baseWindow * failues + baseWindow * (failure + 1) * (random number between [0.0,1.0]).</description>
+  <description>The base waiting window (in milliseconds) before the next retry. The actual wait time is calculated by baseWindow * failues  baseWindow * (failure  1) * (random number between [0.0,1.0]).</description>
 </property>
 
 <property>
@@ -1174,7 +1174,7 @@
 <property>
   <name>hive.stats.retries.wait</name>
   <value>3000</value>
-  <description>The base waiting window (in milliseconds) before the next retry. The actual wait time is calculated by baseWindow * failues + baseWindow * (failure + 1) * (random number between [0.0,1.0]).</description>
+  <description>The base waiting window (in milliseconds) before the next retry. The actual wait time is calculated by baseWindow * failues  baseWindow * (failure  1) * (random number between [0.0,1.0]).</description>
 </property>
 
 <property>
@@ -1676,7 +1676,7 @@
     Currently the query should be single sourced not having any subquery and should not have
     any aggregations or distincts (which incurrs RS), lateral views and joins.
     1. minimal : SELECT STAR, FILTER on partition columns, LIMIT only
-    2. more    : SELECT, FILTER, LIMIT only (+TABLESAMPLE, virtual columns)
+    2. more    : SELECT, FILTER, LIMIT only (TABLESAMPLE, virtual columns)
   </description>
 </property>
 
@@ -1692,7 +1692,6 @@
    <description>The number of miliseconds between HMSHandler retry attempts</description>
 </property>
 
-
 <property>
    <name>hive.server.read.socket.timeout</name>
    <value>10</value>
@@ -1765,5 +1764,92 @@
   <value>false</value>
   <description>Whether to enable using Column Position Alias in Group By or Order By</description>
 </property>
+
+ <property>
+  <name>hive.server2.thrift.min.worker.threads</name>
+  <value>5</value>
+  <description>Minimum number of Thrift worker threads</description>
+</property>
+
+<property>
+  <name>hive.server2.thrift.max.worker.threads</name>
+  <value>100</value>
+  <description>Maximum number of Thrift worker threads</description>
+</property>
+
+<property>
+  <name>hive.server2.thrift.port</name>
+  <value>10000</value>
+  <description>Port number of HiveServer2 Thrift interface.
+  Can be overridden by setting $HIVE_SERVER2_THRIFT_PORT</description>
+</property>
+
+<property>
+  <name>hive.server2.thrift.bind.host</name>
+  <value>localhost</value>
+  <description>Bind host on which to run the HiveServer2 Thrift interface.
+  Can be overridden by setting $HIVE_SERVER2_THRIFT_BIND_HOST</description>
+</property>
+
+<property>
+  <name>hive.server2.authentication</name>
+  <value>NONE</value>
+  <description>
+    Client authentication types.
+       NONE: no authentication check
+       LDAP: LDAP/AD based authentication
+       KERBEROS: Kerberos/GSSAPI authentication
+       CUSTOM: Custom authentication provider
+               (Use with property hive.server2.custom.authentication.class)
+  </description>
+</property>
+
+<property>
+  <name>hive.server2.custom.authentication.class</name>
+  <value></value>
+  <description>
+    Custom authentication class. Used when property
+    'hive.server2.authentication' is set to 'CUSTOM'. Provided class
+    must be a proper implementation of the interface
+    org.apache.hive.service.auth.PasswdAuthenticationProvider. HiveServer2
+    will call its Authenticate(user, passed) method to authenticate requests.
+    The implementation may optionally extend the Hadoop's
+    org.apache.hadoop.conf.Configured class to grab Hive's Configuration object.
+  </description>
+</property>
+
+<property>
+  <name>>hive.server2.authentication.kerberos.principal</name>
+  <value></value>
+  <description>
+    Kerberos server principal
+  </description>
+</property>
+
+<property>
+  <name>>hive.server2.authentication.kerberos.keytab</name>
+  <value></value>
+  <description>
+    Kerberos keytab file for server principal
+  </description>
+</property>
+ 
+<property>
+  <name>hive.server2.authentication.ldap.url</name>
+  <value></value>
+  <description>
+    LDAP connection URL
+  </description>
+</property>
+
+
+<property>
+  <name>hive.server2.authentication.ldap.baseDN</name>
+  <value></value>
+  <description>
+    LDAP base DN
+  </description>
+</property>
+
 </configuration>
 

Modified: hive/branches/ptf-windowing/contrib/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/contrib/build.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/contrib/build.xml (original)
+++ hive/branches/ptf-windowing/contrib/build.xml Tue Mar 19 22:37:16 2013
@@ -49,7 +49,8 @@
     <mkdir dir="${test.log.dir}/contribclientpositive"/>
     <mkdir dir="${test.log.dir}/contribclientnegative"/>
 
-    <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/ql/parse" 
+    <qtestgen hiveRootDirectory="${hive.root}"
+              outputDirectory="${test.build.src}/org/apache/hadoop/hive/ql/parse" 
               templatePath="${ql.test.template.dir}" template="TestParse.vm" 
               queryDirectory="${contrib.test.query.dir}/positive"
               queryFile="${qfile}"
@@ -71,7 +72,8 @@
               logDirectory="${test.log.dir}/contribnegative"/>
    -->
 
-    <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
+    <qtestgen hiveRootDirectory="${hive.root}"
+              outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
               templatePath="${ql.test.template.dir}" template="TestCliDriver.vm" 
               queryDirectory="${contrib.test.query.dir}/clientpositive" 
               queryFile="${qfile}"
@@ -84,7 +86,8 @@
               hadoopVersion="${hadoopVersion}"
     />
 
-    <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
+    <qtestgen hiveRootDirectory="${hive.root}"
+              outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
               templatePath="${ql.test.template.dir}" template="TestNegativeCliDriver.vm" 
               queryDirectory="${contrib.test.query.dir}/clientnegative" 
               queryFile="${qfile}"

Modified: hive/branches/ptf-windowing/contrib/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/contrib/ivy.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/contrib/ivy.xml (original)
+++ hive/branches/ptf-windowing/contrib/ivy.xml Tue Mar 19 22:37:16 2013
@@ -28,17 +28,5 @@
   <dependencies>
     <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
                 conf="compile->default" />
-    <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
-                conf="compile->default" transitive="false" />
-    <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
-                transitive="false"/>
-    <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
-                transitive="false"/>
-    <dependency org="commons-codec" name="commons-codec" rev="${commons-codec.version}"
-                transitive="false"/>
-
-    <!-- Test Dependencies -->
-    <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
-
   </dependencies>
 </ivy-module>

Modified: hive/branches/ptf-windowing/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/eclipse-templates/.classpath?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/eclipse-templates/.classpath (original)
+++ hive/branches/ptf-windowing/eclipse-templates/.classpath Tue Mar 19 22:37:16 2013
@@ -40,7 +40,6 @@
   <classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/jetty-util-6.1.14.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/jsp-2.1-6.1.14.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/jsp-api-2.1-6.1.14.jar"/>
-  <classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/junit-4.5.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/kfs-0.3.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/mina-core-2.0.0-M5.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/hadoop0.20.shim/oro-2.0.8.jar"/>
@@ -56,6 +55,7 @@
   <classpathentry kind="lib" path="build/ivy/lib/default/commons-lang-@commons-lang.version@.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/default/commons-logging-@commons-logging.version@.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/default/commons-logging-api-@commons-logging-api.version@.jar"/>
+  <classpathentry kind="lib" path="build/ivy/lib/default/commons-io-@commons-io.version@.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/default/derby-@derby.version@.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/default/guava-@guava-hadoop20.version@.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/default/hbase-@hbase.version@.jar"/>
@@ -88,20 +88,34 @@
   <classpathentry kind="lib" path="build/ivy/lib/default/mockito-all-@mockito-all.version@.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/default/stringtemplate-@stringtemplate.version@.jar"/>
   <classpathentry kind="lib" path="build/ivy/lib/default/snappy-@snappy.version@.jar"/>
+  <classpathentry kind="lib" path="build/ivy/lib/default/tempus-fugit-@tempus-fugit.version@.jar"/>
   <classpathentry kind="lib" path="build/builtins/hive-builtins-@HIVE_VERSION@.jar"/>
   <classpathentry kind="src" path="build/contrib/test/src"/>
   <classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>
   <classpathentry kind="src" path="build/ql/test/src"/>
   <classpathentry kind="src" path="build/ql/gen/antlr/gen-java"/>
+  <classpathentry kind="src" path="beeline/src/java"/>
+  <classpathentry kind="src" path="beeline/src/test"/>
+  <classpathentry kind="src" path="builtins/src"/>
   <classpathentry kind="src" path="cli/src/java"/>
+  <classpathentry kind="src" path="cli/src/test"/>
   <classpathentry kind="src" path="common/src/java"/>
   <classpathentry kind="src" path="common/src/test"/>
   <classpathentry kind="src" path="contrib/src/java"/>
   <classpathentry kind="src" path="contrib/src/test"/>
+  <classpathentry kind="src" path="hbase-handler/src/java"/>
+  <classpathentry kind="src" path="hwi/src/java"/>
+  <classpathentry kind="src" path="hwi/src/test"/>
+  <classpathentry kind="src" path="jdbc/src/java"/>
+  <classpathentry kind="src" path="jdbc/src/test"/>
+  <classpathentry kind="src" path="hcatalog/src/java"/>
+  <classpathentry kind="src" path="hcatalog/src/test"/>
   <classpathentry kind="src" path="metastore/src/gen/thrift/gen-javabean"/>
   <classpathentry kind="src" path="metastore/src/java"/>
   <classpathentry kind="src" path="metastore/src/model"/>
   <classpathentry kind="src" path="metastore/src/test"/>
+  <classpathentry kind="src" path="pdk/src/java"/>
+  <classpathentry kind="src" path="pdk/test-plugin/src"/>
   <classpathentry kind="src" path="ql/src/gen/thrift/gen-javabean"/>
   <classpathentry kind="src" path="ql/src/gen/protobuf/gen-java"/>
   <classpathentry kind="src" path="ql/src/java"/>
@@ -113,17 +127,9 @@
   <classpathentry kind="src" path="service/src/gen/thrift/gen-javabean"/>
   <classpathentry kind="src" path="service/src/java"/>
   <classpathentry kind="src" path="service/src/test"/>
-  <classpathentry kind="src" path="jdbc/src/java"/>
-  <classpathentry kind="src" path="jdbc/src/test"/>
   <classpathentry kind="src" path="shims/src/@HADOOPVERPREF@/java"/>
   <classpathentry kind="src" path="shims/src/common/java"/>
-  <classpathentry kind="src" path="hwi/src/java"/>
-  <classpathentry kind="src" path="hwi/src/test"/>
-  <classpathentry kind="src" path="hbase-handler/src/java"/>
   <classpathentry excluding="queries/|results/|templates/" kind="src" path="hbase-handler/src/test"/>
-  <classpathentry kind="src" path="pdk/src/java"/>
-  <classpathentry kind="src" path="pdk/test-plugin/src"/>
-  <classpathentry kind="src" path="builtins/src"/>
-  <classpathentry kind="src" path="cli/src/test"/>
+  <classpathentry kind="src" path="testutils/src/java"/>
   <classpathentry kind="output" path="build/eclipse-classes"/>
 </classpath>

Modified: hive/branches/ptf-windowing/hbase-handler/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/hbase-handler/build.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/hbase-handler/build.xml (original)
+++ hive/branches/ptf-windowing/hbase-handler/build.xml Tue Mar 19 22:37:16 2013
@@ -47,7 +47,8 @@
     <mkdir dir="${test.log.dir}/hbase-handler"/>
     <mkdir dir="${hbase-handler.test.results.dir}"/>
 
-    <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
+    <qtestgen hiveRootDirectory="${hive.root}"
+              outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
               templatePath="${ql.hbase.test.template.dir}" template="TestHBaseCliDriver.vm" 
               queryDirectory="${hbase-handler.test.query.dir}/positive" 
               queryFile="${qfile}"
@@ -56,7 +57,8 @@
               resultsDirectory="${hbase-handler.test.results.dir}/positive" className="TestHBaseCliDriver"
               logFile="${test.log.dir}/testhbaseclidrivergen.log"
               logDirectory="${test.log.dir}/hbase-handler"/>
-    <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
+    <qtestgen hiveRootDirectory="${hive.root}"
+              outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
               templatePath="${ql.hbase.test.template.dir}" template="TestHBaseCliDriver.vm" 
               queryDirectory="${hbase-handler.test.query.dir}/positive" 
               queryFile="hbase_bulk.m"
@@ -65,7 +67,8 @@
               resultsDirectory="${hbase-handler.test.results.dir}/positive" className="TestHBaseMinimrCliDriver"
               logFile="${test.log.dir}/testhbaseminimrclidrivergen.log"
               logDirectory="${test.log.dir}/hbase-handler"/>
-  <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli"
+   <qtestgen  hiveRootDirectory="${hive.root}"
+              outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli"
               templatePath="${ql.hbase.test.template.dir}" template="TestHBaseNegativeCliDriver.vm"
               queryDirectory="${hbase-handler.test.query.dir}/negative"
               queryFile="${qfile}"

Modified: hive/branches/ptf-windowing/hbase-handler/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/hbase-handler/ivy.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/hbase-handler/ivy.xml (original)
+++ hive/branches/ptf-windowing/hbase-handler/ivy.xml Tue Mar 19 22:37:16 2013
@@ -28,12 +28,6 @@
   <dependencies>
     <dependency org="org.apache.hive" name="hive-exec" rev="${version}"
                 conf="compile->default" />
-    <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
-                transitive="false"/>
-    <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
-                transitive="false"/>
-    <dependency org="log4j" name="log4j" rev="${log4j.version}"
-                transitive="false"/>
     <dependency org="org.apache.hbase" name="hbase" rev="${hbase.version}"
                 transitive="false">
       <artifact name="hbase" type="jar"/>
@@ -42,42 +36,7 @@
     </dependency>
     <dependency org="com.github.stephenc.high-scale-lib" name="high-scale-lib" rev="1.1.1"
                 transitive="false"/>
-    <dependency org="org.apache.zookeeper" name="zookeeper" rev="${zookeeper.version}"
-                transitive="false"/>
     <dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="${jackson.version}"/>
     <dependency org="org.codehaus.jackson" name="jackson-xc" rev="${jackson.version}"/>
-
-    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="${hadoop-0.23.version}"
-                conf="hadoop23.test->default" transitive="false">
-      <artifact name="hadoop-mapreduce-client-jobclient" ext="jar" />
-      <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
-    <dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests"
-                rev="${hadoop-0.23.version}"
-                conf="hadoop23.test->default">
-      <artifact name="hadoop-yarn-server-tests" type="tests" ext="jar" m:classifier="tests"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
-    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-app"
-                rev="${hadoop-0.23.version}"
-                conf="hadoop23.test->default">
-      <include type="jar"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
-    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-hs"
-                rev="${hadoop-0.23.version}"
-                conf="hadoop23.test->default">
-      <include type="jar"/>
-      <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
-      <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
-    </dependency>
-
-    <!-- Test Dependencies -->
-    <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
-
   </dependencies>
 </ivy-module>

Modified: hive/branches/ptf-windowing/hbase-handler/src/test/queries/negative/cascade_dbdrop.q
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/hbase-handler/src/test/queries/negative/cascade_dbdrop.q?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/hbase-handler/src/test/queries/negative/cascade_dbdrop.q (original)
+++ hive/branches/ptf-windowing/hbase-handler/src/test/queries/negative/cascade_dbdrop.q Tue Mar 19 22:37:16 2013
@@ -1,7 +1,7 @@
 
 CREATE DATABASE hbaseDB;
 
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+-- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- Hadoop 0.23 changes the behavior FsShell on Exit Codes
 -- In Hadoop 0.20
 -- Exit Code == 0 on success

Modified: hive/branches/ptf-windowing/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q (original)
+++ hive/branches/ptf-windowing/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q Tue Mar 19 22:37:16 2013
@@ -1,7 +1,7 @@
 
 CREATE DATABASE hbaseDB;
 
--- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+-- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- Hadoop 0.23 changes the behavior FsShell on Exit Codes
 -- In Hadoop 0.20
 -- Exit Code == 0 on success

Modified: hive/branches/ptf-windowing/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out (original)
+++ hive/branches/ptf-windowing/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out Tue Mar 19 22:37:16 2013
@@ -2,7 +2,7 @@ PREHOOK: query: CREATE DATABASE hbaseDB
 PREHOOK: type: CREATEDATABASE
 POSTHOOK: query: CREATE DATABASE hbaseDB
 POSTHOOK: type: CREATEDATABASE
-PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- Hadoop 0.23 changes the behavior FsShell on Exit Codes
 -- In Hadoop 0.20
 -- Exit Code == 0 on success
@@ -17,7 +17,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
 TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- Hadoop 0.23 changes the behavior FsShell on Exit Codes
 -- In Hadoop 0.20
 -- Exit Code == 0 on success

Modified: hive/branches/ptf-windowing/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out (original)
+++ hive/branches/ptf-windowing/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out Tue Mar 19 22:37:16 2013
@@ -2,7 +2,7 @@ PREHOOK: query: CREATE DATABASE hbaseDB
 PREHOOK: type: CREATEDATABASE
 POSTHOOK: query: CREATE DATABASE hbaseDB
 POSTHOOK: type: CREATEDATABASE
-PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- Hadoop 0.23 changes the behavior FsShell on Exit Codes
 -- In Hadoop 0.20
 -- Exit Code == 0 on success
@@ -17,7 +17,7 @@ STORED BY 'org.apache.hadoop.hive.hbase.
 WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
 TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 -- Hadoop 0.23 changes the behavior FsShell on Exit Codes
 -- In Hadoop 0.20
 -- Exit Code == 0 on success

Modified: hive/branches/ptf-windowing/hwi/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/hwi/ivy.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/hwi/ivy.xml (original)
+++ hive/branches/ptf-windowing/hwi/ivy.xml Tue Mar 19 22:37:16 2013
@@ -29,13 +29,8 @@
     <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="commons-logging" name="commons-logging" rev="${commons-logging.version}"
-                transitive="false"/>
-    <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
-                transitive="false"/>
 
     <!-- Test Dependencies -->
-    <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
     <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
                 conf="test->default" transitive="false"/>
     <dependency org="commons-httpclient" name="commons-httpclient" rev="${commons-httpclient.version}"

Modified: hive/branches/ptf-windowing/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ivy/ivysettings.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ivy/ivysettings.xml (original)
+++ hive/branches/ptf-windowing/ivy/ivysettings.xml Tue Mar 19 22:37:16 2013
@@ -61,7 +61,7 @@
     </filesystem>
 
     <chain name="default" dual="true" returnFirst="true" 
-           checkmodified="true" 
+           checkmodified="${ivy.checkmodified}" 
            changingPattern="${ivy.changingPattern}">
       <resolver ref="local" />
       <resolver ref="apache-snapshot"/>

Modified: hive/branches/ptf-windowing/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/ivy/libraries.properties?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/ivy/libraries.properties (original)
+++ hive/branches/ptf-windowing/ivy/libraries.properties Tue Mar 19 22:37:16 2013
@@ -37,6 +37,7 @@ commons-compress.version=1.4.1
 commons-configuration.version=1.6
 commons-dbcp.version=1.4
 commons-httpclient.version=3.0.1
+commons-io.version=2.4
 commons-lang.version=2.4
 commons-logging.version=1.0.4
 commons-logging-api.version=1.0.4
@@ -51,8 +52,6 @@ jdo-api.version=2.3-ec
 jdom.version=1.1
 jetty.version=6.1.26
 jline.version=0.9.94
-sqlline.version=1_0_2
-sqlline.branch=1.0.2
 json.version=20090211
 junit.version=4.10
 libfb303.version=0.9.0
@@ -62,8 +61,11 @@ maven-ant-tasks.version=2.1.0
 mockito-all.version=1.8.2
 protobuf.version=2.4.1
 rat.version=0.8
+sqlline.version=1_0_2
+sqlline.branch=1.0.2
 slf4j-api.version=1.6.1
 slf4j-log4j12.version=1.6.1
+tempus-fugit.version=1.1
 snappy.version=0.2
 velocity.version=1.5
 zookeeper.version=3.4.3

Modified: hive/branches/ptf-windowing/jdbc/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/jdbc/ivy.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/jdbc/ivy.xml (original)
+++ hive/branches/ptf-windowing/jdbc/ivy.xml Tue Mar 19 22:37:16 2013
@@ -27,17 +27,9 @@
     <include file="${ivy.conf.dir}/common-configurations.xml"/>
   </configurations>
   <dependencies>
-    <dependency org="org.apache.hive" name="hive-service" rev="${version}"
-                conf="compile->default" />
-    <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
-                transitive="false"/>
-    <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
-                transitive="false"/>
     <dependency org="sqlline" name="sqlline" rev="${sqlline.version}" branch="${sqlline.branch}"
                 transitive="false"/>
-
-    <!-- Test Dependencies -->
-    <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
-
+    <dependency org="org.apache.hive" name="hive-cli" rev="${version}"
+                conf="compile->default" />
   </dependencies>
 </ivy-module>

Modified: hive/branches/ptf-windowing/metastore/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/build.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/build.xml (original)
+++ hive/branches/ptf-windowing/metastore/build.xml Tue Mar 19 22:37:16 2013
@@ -22,15 +22,6 @@
   <import file="../build-common.xml"/>
   <property name="model.dir" value="${src.dir}/model"/>
 
-  <target name="thriftif" depends="check-thrift-home">
-    <echo message="Project: ${ant.project.name}"/>
-    <fail unless="thrift.home">You must set the 'thrift.home' property!</fail>
-    <echo>Executing ${thrift.home}/bin/thrift on ${ant.project.name}/if/hive_metastore.thrift</echo>
-    <exec executable="${thrift.home}/bin/thrift"  failonerror="true" dir=".">
-      <arg line="${thrift.args} -o ${src.dir}/gen/thrift if/hive_metastore.thrift " />
-    </exec>
-  </target>
-
   <uptodate property="grammarBuild.notRequired">
     <srcfiles dir= "${src.dir}/java/org/apache/hadoop/hive/metastore/parser" includes="**/*.g"/>
     <mapper type="merge" to="${build.dir}/gen/antlr/gen-java/org/apache/hadoop/hive/metastore/parser/FilterParser.java"/>

Modified: hive/branches/ptf-windowing/metastore/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/ivy.xml?rev=1458549&r1=1458548&r2=1458549&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/ivy.xml (original)
+++ hive/branches/ptf-windowing/metastore/ivy.xml Tue Mar 19 22:37:16 2013
@@ -28,16 +28,8 @@
   <dependencies>
     <dependency org="org.apache.hive" name="hive-serde" rev="${version}"
                 conf="compile->default" />
-    <dependency org="org.apache.hive" name="hive-shims" rev="${version}"
-                conf="compile->default" transitive="false" />
     <dependency org="org.antlr" name="antlr" rev="${antlr.version}"/>
     <dependency org="org.antlr" name="antlr-runtime" rev="${antlr-runtime.version}"/>
-    <dependency org="commons-cli" name="commons-cli" rev="${commons-cli.version}"/>
-    <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"/>
-    <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
-                transitive="false"/>
-    <dependency org="commons-logging" name="commons-logging-api" rev="${commons-logging-api.version}"
-                transitive="false"/>
     <dependency org="commons-dbcp" name="commons-dbcp" rev="${commons-dbcp.version}">
       <exclude module="commons-pool" />
       <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
@@ -54,17 +46,7 @@
     <dependency org="javax.jdo" name="jdo2-api" rev="${jdo-api.version}"
                 transitive="false"/>
     <dependency org="org.apache.derby" name="derby" rev="${derby.version}"/>
-    <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
-    <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"
-                transitive="false"/>
-    <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}" transitive="false" />
-
-    <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}" transitive="false" />
-
     <dependency org="asm" name="asm" rev="${asm.version}"/>
 
-    <!-- Test Dependencies -->
-    <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default" />
-
   </dependencies>
 </ivy-module>



Mime
View raw message