Return-Path: 
 <commits-return-6123-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-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 7946210A8A
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Thu, 29 May 2014 01:31:15 +0000 (UTC)
Received: (qmail 67527 invoked by uid 500); 29 May 2014 01:31:15 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 67481 invoked by uid 500); 29 May 2014 01:31:15 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 67474 invoked by uid 99); 29 May 2014 01:31:15 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 May 2014 01:31:15 +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; Thu, 29 May 2014 01:31:14 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 45BEE238890B;
	Thu, 29 May 2014 01:30:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1598192 - in /manifoldcf/branches/release-1.6-branch: ./
 CHANGES.txt connectors/elasticsearch/build.xml
 framework/buildfiles/connector-build.xml
Date: Thu, 29 May 2014 01:30:54 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140529013054.45BEE238890B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Thu May 29 01:30:53 2014
New Revision: 1598192

URL: http://svn.apache.org/r1598192
Log:
Pull up fix for CONNECTORS-947 from trunk

Modified:
    manifoldcf/branches/release-1.6-branch/   (props changed)
    manifoldcf/branches/release-1.6-branch/CHANGES.txt
    manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml
    manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml

Propchange: manifoldcf/branches/release-1.6-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1598191

Modified: manifoldcf/branches/release-1.6-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/CHANGES.txt?rev=1598192&r1=1598191&r2=1598192&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.6-branch/CHANGES.txt Thu May 29 01:30:53 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 1.6.1 =====================
 
+CONNECTORS-947: ant test fails when make-deps is not run.
+(Karl Wright)
+
 CONNECTORS-944: Maven build has different stuff in war file than
 ant build.
 (Arcadius Ahouansou, Karl Wright)

Modified: manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml?rev=1598192&r1=1598191&r2=1598192&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml Thu May 29 01:30:53 2014
@@ -69,7 +69,7 @@
     </target>
 
     <target name="calculate-testcode-condition">
-        <available file="test-materials-proprietary" property="tests-present"/>
+        <available file="test-materials-proprietary/elasticsearch-1.0.1" property="tests-present"/>
     </target>
 
     <path id="connector-test-classpath">

Modified: manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml?rev=1598192&r1=1598191&r2=1598192&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml Thu May 29 01:30:53 2014
@@ -290,7 +290,7 @@
         </javac>
     </target>
 
-    <target name="has-tests-check" depends="precompile-check" if="canBuild">
+    <target name="has-tests-check" depends="pretest-check" if="canTest">
         <available file="connector/src/test/java" property="hasTests"/>
     </target>