[10/50] [abbrv] hive git commit: HIVE-10605 - Make hive version number update automatically in webhcat-default.xml during hive tar generation (Eugene Koifman, reviewed by Thejas Nair)

2015-05-14 Thread xuefu 
HIVE-10605 - Make hive version number update automatically in 
webhcat-default.xml during hive tar generation (Eugene Koifman, reviewed by 
Thejas Nair)


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

Branch: refs/heads/beeline-cli
Commit: eefb0718ea347680850620c5dd9eff5ec202566d
Parents: 02b6cd1
Author: Eugene Koifman ekoif...@hortonworks.com
Authored: Tue May 5 18:00:15 2015 -0700
Committer: Eugene Koifman ekoif...@hortonworks.com
Committed: Tue May 5 18:00:15 2015 -0700

--
 .../deployers/config/webhcat/webhcat-site.xml  |  9 +
 hcatalog/src/test/e2e/templeton/deployers/env.sh   |  1 +
 hcatalog/webhcat/svr/pom.xml   | 13 +++--
 .../webhcat/svr/src/main/config/webhcat-default.xml| 10 +-
 packaging/src/main/assembly/bin.xml|  1 +
 5 files changed, 15 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
--
diff --git 
a/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml 
b/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
index 7a2d450..8bcb1f0 100644
--- a/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
+++ b/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
@@ -24,8 +24,7 @@
 !-- install. --
 
 configuration
-!--TODO:
-1. make pig/hive versions env variables--
+!--TODO:--
 
   property
 nametempleton.hcat/name
@@ -34,12 +33,6 @@
   /property
 
 property
-nametempleton.libjars/name
-
value${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar/value
-descriptionJars to add to the classpath./description
-/property
-
-property
 nametempleton.pig.archive/name
 valuehdfs:///apps/templeton/pig-${env.PIG_VERSION}.tar.gz/value
 descriptionThe path to the Pig archive./description

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/src/test/e2e/templeton/deployers/env.sh
--
diff --git a/hcatalog/src/test/e2e/templeton/deployers/env.sh 
b/hcatalog/src/test/e2e/templeton/deployers/env.sh
index a9cc2d7..8b719f2 100755
--- a/hcatalog/src/test/e2e/templeton/deployers/env.sh
+++ b/hcatalog/src/test/e2e/templeton/deployers/env.sh
@@ -22,6 +22,7 @@
 
 # define necessary env vars here and source it in other files
 
+#todo: most of these variables are defined in pom.xml - see this can be 
integrated
 echo ${HADOOP_VERSION};
 
 if [ -z ${HADOOP_VERSION} ]; then

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/webhcat/svr/pom.xml
--
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index 54b8c98..5b6696e 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -151,12 +151,13 @@
   /profiles
 
   build
-  resources
-  resource
-  targetPath./targetPath
-  directorysrc/main/config/directory
-  /resource
-  /resources
+resources
+  resource
+targetPath./targetPath
+directorysrc/main/config/directory
+filteringtrue/filtering
+  /resource
+/resources
 plugins
   plugin
 groupIdorg.apache.maven.plugins/groupId

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
--
diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml 
b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
index dc6521a..801f3a5 100644
--- a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
+++ b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
@@ -39,7 +39,7 @@
 
   property
 nametempleton.libjars/name
-
value${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar/value
+
value${env.TEMPLETON_HOME}/../lib/zookeeper-${zookeeper.version}.jar,${env.TEMPLETON_HOME}/../lib/hive-common-${project.version}.jar/value
 descriptionJars to add to the classpath./description
   /property
 
@@ -87,7 +87,7 @@
 
   property
 nametempleton.pig.path/name
-valuepig-0.11.1.tar.gz/pig-0.11.1/bin/pig/value
+valuepig-${pig.version}.tar.gz/pig-${pig.version}/bin/pig/value
 descriptionThe path to the Pig

[40/52] [abbrv] hive git commit: HIVE-10605 - Make hive version number update automatically in webhcat-default.xml during hive tar generation (Eugene Koifman, reviewed by Thejas Nair)

2015-05-06 Thread prasanthj 
HIVE-10605 - Make hive version number update automatically in 
webhcat-default.xml during hive tar generation (Eugene Koifman, reviewed by 
Thejas Nair)


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

Branch: refs/heads/llap
Commit: eefb0718ea347680850620c5dd9eff5ec202566d
Parents: 02b6cd1
Author: Eugene Koifman ekoif...@hortonworks.com
Authored: Tue May 5 18:00:15 2015 -0700
Committer: Eugene Koifman ekoif...@hortonworks.com
Committed: Tue May 5 18:00:15 2015 -0700

--
 .../deployers/config/webhcat/webhcat-site.xml  |  9 +
 hcatalog/src/test/e2e/templeton/deployers/env.sh   |  1 +
 hcatalog/webhcat/svr/pom.xml   | 13 +++--
 .../webhcat/svr/src/main/config/webhcat-default.xml| 10 +-
 packaging/src/main/assembly/bin.xml|  1 +
 5 files changed, 15 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
--
diff --git 
a/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml 
b/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
index 7a2d450..8bcb1f0 100644
--- a/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
+++ b/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
@@ -24,8 +24,7 @@
 !-- install. --
 
 configuration
-!--TODO:
-1. make pig/hive versions env variables--
+!--TODO:--
 
   property
 nametempleton.hcat/name
@@ -34,12 +33,6 @@
   /property
 
 property
-nametempleton.libjars/name
-
value${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar/value
-descriptionJars to add to the classpath./description
-/property
-
-property
 nametempleton.pig.archive/name
 valuehdfs:///apps/templeton/pig-${env.PIG_VERSION}.tar.gz/value
 descriptionThe path to the Pig archive./description

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/src/test/e2e/templeton/deployers/env.sh
--
diff --git a/hcatalog/src/test/e2e/templeton/deployers/env.sh 
b/hcatalog/src/test/e2e/templeton/deployers/env.sh
index a9cc2d7..8b719f2 100755
--- a/hcatalog/src/test/e2e/templeton/deployers/env.sh
+++ b/hcatalog/src/test/e2e/templeton/deployers/env.sh
@@ -22,6 +22,7 @@
 
 # define necessary env vars here and source it in other files
 
+#todo: most of these variables are defined in pom.xml - see this can be 
integrated
 echo ${HADOOP_VERSION};
 
 if [ -z ${HADOOP_VERSION} ]; then

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/webhcat/svr/pom.xml
--
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index 54b8c98..5b6696e 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -151,12 +151,13 @@
   /profiles
 
   build
-  resources
-  resource
-  targetPath./targetPath
-  directorysrc/main/config/directory
-  /resource
-  /resources
+resources
+  resource
+targetPath./targetPath
+directorysrc/main/config/directory
+filteringtrue/filtering
+  /resource
+/resources
 plugins
   plugin
 groupIdorg.apache.maven.plugins/groupId

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
--
diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml 
b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
index dc6521a..801f3a5 100644
--- a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
+++ b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
@@ -39,7 +39,7 @@
 
   property
 nametempleton.libjars/name
-
value${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar/value
+
value${env.TEMPLETON_HOME}/../lib/zookeeper-${zookeeper.version}.jar,${env.TEMPLETON_HOME}/../lib/hive-common-${project.version}.jar/value
 descriptionJars to add to the classpath./description
   /property
 
@@ -87,7 +87,7 @@
 
   property
 nametempleton.pig.path/name
-valuepig-0.11.1.tar.gz/pig-0.11.1/bin/pig/value
+valuepig-${pig.version}.tar.gz/pig-${pig.version}/bin/pig/value
 descriptionThe path to the Pig

hive git commit: HIVE-10605 - Make hive version number update automatically in webhcat-default.xml during hive tar generation (Eugene Koifman, reviewed by Thejas Nair)

2015-05-05 Thread ekoifman 
Repository: hive
Updated Branches:
  refs/heads/master 02b6cd110 - eefb0718e


HIVE-10605 - Make hive version number update automatically in 
webhcat-default.xml during hive tar generation (Eugene Koifman, reviewed by 
Thejas Nair)


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

Branch: refs/heads/master
Commit: eefb0718ea347680850620c5dd9eff5ec202566d
Parents: 02b6cd1
Author: Eugene Koifman ekoif...@hortonworks.com
Authored: Tue May 5 18:00:15 2015 -0700
Committer: Eugene Koifman ekoif...@hortonworks.com
Committed: Tue May 5 18:00:15 2015 -0700

--
 .../deployers/config/webhcat/webhcat-site.xml  |  9 +
 hcatalog/src/test/e2e/templeton/deployers/env.sh   |  1 +
 hcatalog/webhcat/svr/pom.xml   | 13 +++--
 .../webhcat/svr/src/main/config/webhcat-default.xml| 10 +-
 packaging/src/main/assembly/bin.xml|  1 +
 5 files changed, 15 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
--
diff --git 
a/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml 
b/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
index 7a2d450..8bcb1f0 100644
--- a/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
+++ b/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml
@@ -24,8 +24,7 @@
 !-- install. --
 
 configuration
-!--TODO:
-1. make pig/hive versions env variables--
+!--TODO:--
 
   property
 nametempleton.hcat/name
@@ -34,12 +33,6 @@
   /property
 
 property
-nametempleton.libjars/name
-
value${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar/value
-descriptionJars to add to the classpath./description
-/property
-
-property
 nametempleton.pig.archive/name
 valuehdfs:///apps/templeton/pig-${env.PIG_VERSION}.tar.gz/value
 descriptionThe path to the Pig archive./description

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/src/test/e2e/templeton/deployers/env.sh
--
diff --git a/hcatalog/src/test/e2e/templeton/deployers/env.sh 
b/hcatalog/src/test/e2e/templeton/deployers/env.sh
index a9cc2d7..8b719f2 100755
--- a/hcatalog/src/test/e2e/templeton/deployers/env.sh
+++ b/hcatalog/src/test/e2e/templeton/deployers/env.sh
@@ -22,6 +22,7 @@
 
 # define necessary env vars here and source it in other files
 
+#todo: most of these variables are defined in pom.xml - see this can be 
integrated
 echo ${HADOOP_VERSION};
 
 if [ -z ${HADOOP_VERSION} ]; then

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/webhcat/svr/pom.xml
--
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index 54b8c98..5b6696e 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -151,12 +151,13 @@
   /profiles
 
   build
-  resources
-  resource
-  targetPath./targetPath
-  directorysrc/main/config/directory
-  /resource
-  /resources
+resources
+  resource
+targetPath./targetPath
+directorysrc/main/config/directory
+filteringtrue/filtering
+  /resource
+/resources
 plugins
   plugin
 groupIdorg.apache.maven.plugins/groupId

http://git-wip-us.apache.org/repos/asf/hive/blob/eefb0718/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
--
diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml 
b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
index dc6521a..801f3a5 100644
--- a/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
+++ b/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
@@ -39,7 +39,7 @@
 
   property
 nametempleton.libjars/name
-
value${env.TEMPLETON_HOME}/../lib/zookeeper-3.4.6.jar,${env.TEMPLETON_HOME}/../lib/hive-common-1.2.0-SNAPSHOT.jar/value
+
value${env.TEMPLETON_HOME}/../lib/zookeeper-${zookeeper.version}.jar,${env.TEMPLETON_HOME}/../lib/hive-common-${project.version}.jar/value
 descriptionJars to add to the classpath./description
   /property
 
@@ -87,7 +87,7 @@
 
   property
 nametempleton.pig.path/name
-valuepig-0.11.1.tar.gz/pig-0.11.1/bin/pig/value
+