svn commit: r1228019 - in /incubator/hcatalog/trunk: CHANGES.txt src/test/e2e/hcatalog/tools/generate/generate_data.pl

[khorgath]

Author: khorgath
Date: Fri Jan  6 08:48:31 2012
New Revision: 1228019

URL: http://svn.apache.org/viewvc?rev=1228019&view=rev
Log:
HCATALOG-197 Data generator for e2e assumes hadoop tarball installation (daijy 
via khorgath)

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1228019&r1=1228018&r2=1228019&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Fri Jan  6 08:48:31 2012
@@ -91,6 +91,8 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-197. Data generator for e2e assumes hadoop tarball installation (daijy 
via khorgath)
+
   HCAT-196. Remove dependency on pig.jar for hcatalog server (daijy via 
khorgath)
 
   HCAT-195. New storage-drivers directory not picked up in src-release target 
(gates via khorgath)

Modified: 
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl?rev=1228019&r1=1228018&r2=1228019&view=diff
==============================================================================
--- 
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl 
(original)
+++ 
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl 
Fri Jan  6 08:48:31 2012
@@ -336,15 +336,23 @@ our $hadoopCoreJar = undef;
 
 sub findHadoopJars()
 {
-    if (not defined $ENV{'HADOOP_HOME'}) {
+    my $hadoopClassRoot;
+    if (defined $ENV{'HADOOP_HOME'}) {
+        $hadoopClassRoot = $ENV{'HADOOP_HOME'};
+    } else {
+        $hadoopClassRoot = "/usr/share/hadoop";
+    }
+
+    my $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`;
+    my $loggingJar = `ls $hadoopClassRoot/lib/commons-logging-*.jar | grep -v 
api`;
+    my $cfgJar = `ls $hadoopClassRoot/lib/commons-configuration-*.jar`;
+    my $langJar = `ls $hadoopClassRoot/lib/commons-lang-*.jar`;
+    my $cliJar = `ls $hadoopClassRoot/lib/commons-cli-*.jar`;
+
+    if ($coreJar=="") {
         die 'Please set $HADOOP_HOME\n';
     }
 
-    my $coreJar = `ls $ENV{'HADOOP_HOME'}/hadoop-core-*.jar`;
-    my $loggingJar = `ls $ENV{'HADOOP_HOME'}/lib/commons-logging-*.jar | grep 
-v api`;
-    my $cfgJar = `ls $ENV{'HADOOP_HOME'}/lib/commons-configuration-*.jar`;
-    my $langJar = `ls $ENV{'HADOOP_HOME'}/lib/commons-lang-*.jar`;
-    my $cliJar = `ls $ENV{'HADOOP_HOME'}/lib/commons-cli-*.jar`;
     chomp $coreJar;
     chomp $loggingJar;
     chomp $cfgJar;