Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 D8626D6D9 for ; Mon, 10 Sep 2012 12:45:38 +0000 (UTC) Received: (qmail 35274 invoked by uid 500); 10 Sep 2012 12:45:38 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 35138 invoked by uid 500); 10 Sep 2012 12:45:35 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 35096 invoked by uid 99); 10 Sep 2012 12:45:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2012 12:45:33 +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; Mon, 10 Sep 2012 12:45:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6346423888E4; Mon, 10 Sep 2012 12:44:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1382802 - in /camel/trunk/components/camel-elasticsearch/src: main/java/org/apache/camel/component/elasticsearch/ test/java/org/apache/camel/component/elasticsearch/ test/resources/ test/resources/org/ test/resources/org/apache/ test/resou... Date: Mon, 10 Sep 2012 12:44:48 -0000 To: commits@camel.apache.org From: bvahdat@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120910124448.6346423888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bvahdat Date: Mon Sep 10 12:44:47 2012 New Revision: 1382802 URL: http://svn.apache.org/viewvc?rev=1382802&view=rev Log: CAMEL-5586: Polished the camel-elasticsearch codebase. Added: camel/trunk/components/camel-elasticsearch/src/test/resources/org/ camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/ camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/camel/ camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/camel/component/ camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/camel/component/elasticsearch/ camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/camel/component/elasticsearch/SpringElasticsearchTest-context.xml - copied unchanged from r1382732, camel/trunk/components/camel-elasticsearch/src/test/resources/SpringElasticsearchTest.xml Removed: camel/trunk/components/camel-elasticsearch/src/test/resources/SpringElasticsearchTest.xml Modified: camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java Modified: camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java?rev=1382802&r1=1382801&r2=1382802&view=diff ============================================================================== --- camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java (original) +++ camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java Mon Sep 10 12:44:47 2012 @@ -76,6 +76,7 @@ public class ElasticsearchEndpoint exten } else { LOG.info("Leaving ElasticSearch cluster " + config.getClusterName()); } + client.close(); node.close(); super.doStop(); } Modified: camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java?rev=1382802&r1=1382801&r2=1382802&view=diff ============================================================================== --- camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java (original) +++ camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java Mon Sep 10 12:44:47 2012 @@ -27,7 +27,7 @@ import org.junit.Test; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -@ContextConfiguration(locations = {"/SpringElasticsearchTest.xml"}) +@ContextConfiguration public class SpringElasticsearchTest extends AbstractJUnit4SpringContextTests { @Produce(uri = "direct:index")