Return-Path: 
 <commits-return-6760-apmail-pig-commits-archive=pig.apache.org@pig.apache.org>
X-Original-To: apmail-pig-commits-archive@www.apache.org
Delivered-To: apmail-pig-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B167111A9C
	for <apmail-pig-commits-archive@www.apache.org>;
 Fri, 20 Jun 2014 07:07:44 +0000 (UTC)
Received: (qmail 5509 invoked by uid 500); 20 Jun 2014 07:07:44 -0000
Delivered-To: apmail-pig-commits-archive@pig.apache.org
Received: (qmail 5472 invoked by uid 500); 20 Jun 2014 07:07:44 -0000
Mailing-List: contact commits-help@pig.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@pig.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@pig.apache.org>
List-Post: <mailto:commits@pig.apache.org>
List-Id: <commits.pig.apache.org>
Reply-To: dev@pig.apache.org
Delivered-To: mailing list commits@pig.apache.org
Received: (qmail 5463 invoked by uid 99); 20 Jun 2014 07:07:44 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jun 2014 07:07:44 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jun 2014 07:07:43 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 030FC2388831;
	Fri, 20 Jun 2014 07:07:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1604096 - in /pig/trunk/test: e2e/pig/build.xml
 perf/pigmix/build.xml
Date: Fri, 20 Jun 2014 07:07:22 -0000
To: commits@pig.apache.org
From: daijy@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140620070723.030FC2388831@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: daijy
Date: Fri Jun 20 07:07:22 2014
New Revision: 1604096

URL: http://svn.apache.org/r1604096
Log:
PIG-3892: Pig distribution for hadoop 2 (PIG-3892-4.patch)

Modified:
    pig/trunk/test/e2e/pig/build.xml
    pig/trunk/test/perf/pigmix/build.xml

Modified: pig/trunk/test/e2e/pig/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/build.xml?rev=1604096&r1=1604095&r2=1604096&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/build.xml (original)
+++ pig/trunk/test/e2e/pig/build.xml Fri Jun 20 07:07:22 2014
@@ -18,7 +18,10 @@
 <project name="TestHarnessPigTests" default="test">
 
   <property name="pig.dir" value="${basedir}/../../.."/>
-  <property name="pig.jar" value="${pig.dir}/pig.jar"/>
+  <condition property="pig.jarname" value="pig-h2.jar" else="pig-h1.jar">
+    <equals arg1="${hadoopversion}" arg2="23" />
+  </condition>
+  <property name="pig.jar" value="${pig.dir}/${pig.jarname}"/>
   <property name="ivy.dir" location="${pig.dir}/ivy" />
   <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
 

Modified: pig/trunk/test/perf/pigmix/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/test/perf/pigmix/build.xml?rev=1604096&r1=1604095&r2=1604096&view=diff
==============================================================================
--- pig/trunk/test/perf/pigmix/build.xml (original)
+++ pig/trunk/test/perf/pigmix/build.xml Fri Jun 20 07:07:22 2014
@@ -19,7 +19,10 @@
 
   <property name="pig.dir" value="${basedir}/../../.."/>
   <property name="pig.bin" value="${pig.dir}/bin/pig"/>
-  <property name="pig.jar" value="${pig.dir}/pig.jar"/>
+  <condition property="pig.jarname" value="pig-h2.jar" else="pig-h1.jar">
+    <equals arg1="${hadoopversion}" arg2="23" />
+  </condition>
+  <property name="pig.jar" value="${pig.dir}/${pig.jarname}"/>
   <property name="ivy.dir" location="${pig.dir}/ivy" />
   <loadproperties srcfile="${ivy.dir}/libraries.properties"/>