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 7B162D616 for ; Mon, 9 Jul 2012 19:19:36 +0000 (UTC) Received: (qmail 66227 invoked by uid 500); 9 Jul 2012 19:19:36 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 66187 invoked by uid 500); 9 Jul 2012 19:19:36 -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 66180 invoked by uid 99); 9 Jul 2012 19:19:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 19:19:36 +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, 09 Jul 2012 19:19:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 609B9238897F; Mon, 9 Jul 2012 19:19:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1359346 - in /camel/branches/camel-2.9.x: ./ camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java components/camel-http/ Date: Mon, 09 Jul 2012 19:19:13 -0000 To: commits@camel.apache.org From: bvahdat@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120709191913.609B9238897F@eris.apache.org> Author: bvahdat Date: Mon Jul 9 19:19:12 2012 New Revision: 1359346 URL: http://svn.apache.org/viewvc?rev=1359346&view=rev Log: Merged revisions 1359343 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x ................ r1359343 | bvahdat | 2012-07-09 21:15:26 +0200 (Mo, 09 Jul 2012) | 9 lines Merged revisions 1359341 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1359341 | bvahdat | 2012-07-09 21:11:46 +0200 (Mo, 09 Jul 2012) | 1 line CAMEL-5432: Polished the unit-test. ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java camel/branches/camel-2.9.x/components/camel-http/ (props changed) Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1359341 Merged /camel/branches/camel-2.10.x:r1359343 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java?rev=1359346&r1=1359345&r2=1359346&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java Mon Jul 9 19:19:12 2012 @@ -25,17 +25,6 @@ import org.apache.camel.component.mock.M */ public class SedaRemoveRouteThenAddAgainTest extends ContextTestSupport { - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - - @Override - public void configure() throws Exception { - from("seda:in").id("sedaToMock").to("mock:out"); - } - }; - } - public void testRemoveRouteAndThenAddAgain() throws Exception { MockEndpoint out = getMockEndpoint("mock:out"); out.expectedMessageCount(1); @@ -61,4 +50,15 @@ public class SedaRemoveRouteThenAddAgain out.assertIsSatisfied(); } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("seda:in").routeId("sedaToMock").to("mock:out"); + } + }; + } + } \ No newline at end of file Propchange: camel/branches/camel-2.9.x/components/camel-http/ ------------------------------------------------------------------------------ Merged /camel/branches/camel-2.10.x/components/camel-http:r1359343 Merged /camel/trunk/components/camel-http:r1359341