svn commit: r1514850 - in /pig/trunk: CHANGES.txt bin/pig bin/pig.cmd bin/pig.py

[ch...@apache.org]

Author: cheolsoo
Date: Fri Aug 16 18:59:32 2013
New Revision: 1514850

URL: http://svn.apache.org/r1514850
Log:
PIG-3425: Hive jdo api jar referenced in pig script throws error (deepesh via cheolsoo)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/bin/pig
    pig/trunk/bin/pig.cmd
    pig/trunk/bin/pig.py

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1514850&r1=1514849&r2=1514850&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Aug 16 18:59:32 2013
@@ -212,6 +212,8 @@ PIG-3013: BinInterSedes improve chararra
 
 BUG FIXES
 
+PIG-3425: Hive jdo api jar referenced in pig script throws error (deepesh via cheolsoo)
+
 PIG-3422: AvroStorage failed to read paths separated by commas (yuanlid via rohini)
 
 PIG-3420: Failed to retrieve map values from data loaded by AvroStorage (yuanlid via rohini)

Modified: pig/trunk/bin/pig
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig?rev=1514850&r1=1514849&r2=1514850&view=diff
==============================================================================
--- pig/trunk/bin/pig (original)
+++ pig/trunk/bin/pig Fri Aug 16 18:59:32 2013
@@ -134,7 +134,7 @@ if [ "$includeHCatalog" == "true" ]; the
   thriftJar=libthrift-*.jar
   hiveExecJar=hive-exec-*.jar
   fbJar=libfb303-*.jar
-  jdoECJar=jdo2-api-*-ec.jar
+  jdoECJar=jdo*-api-*.jar
   slfJar=slf4j-api-*.jar
   hbaseHiveJar=hive-hbase-handler-*.jar
   if [ "$HIVE_HOME" == "" ]; then

Modified: pig/trunk/bin/pig.cmd
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig.cmd?rev=1514850&r1=1514849&r2=1514850&view=diff
==============================================================================
--- pig/trunk/bin/pig.cmd (original)
+++ pig/trunk/bin/pig.cmd Fri Aug 16 18:59:32 2013
@@ -107,7 +107,7 @@ set PIGARGS=
       call :AddJar %HIVE_HOME%\lib libthrift-*.jar
       call :AddJar %HIVE_HOME%\lib hive-exec-*.jar
       call :AddJar %HIVE_HOME%\lib libfb303-*.jar
-      call :AddJar %HIVE_HOME%\lib jdo2-api-*.jar
+      call :AddJar %HIVE_HOME%\lib jdo*-api-*.jar
       call :AddJar %HIVE_HOME%\lib slf4j-api-*.jar
       call :AddJar %HIVE_HOME%\lib hive-hbase-handler-*.jar
       call :AddJar %HIVE_HOME%\lib httpclient-*.jar

Modified: pig/trunk/bin/pig.py
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig.py?rev=1514850&r1=1514849&r2=1514850&view=diff
==============================================================================
--- pig/trunk/bin/pig.py (original)
+++ pig/trunk/bin/pig.py Fri Aug 16 18:59:32 2013
@@ -160,7 +160,7 @@ if includeHCatalog == True:
     else:
       sys.exit("Please initialize HIVE_HOME to the hive install directory")
 
-  allHiveJars = ["hive-metastore-*.jar", "libthrift-*.jar", "hive-exec-*.jar", "libfb303-*.jar", "jdo2-api-*-ec.jar", "slf4j-api-*.jar", "hive-hbase-handler-*.jar"]
+  allHiveJars = ["hive-metastore-*.jar", "libthrift-*.jar", "hive-exec-*.jar", "libfb303-*.jar", "jdo*-api-*.jar", "slf4j-api-*.jar", "hive-hbase-handler-*.jar"]
   for jarName in allHiveJars:
     jar = glob.glob(os.path.join(hiveJarLoc, jarName))
     if (len(jar) != 0) and (os.path.exists(jar)):