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 ED87897EB for ; Thu, 22 Dec 2011 16:15:27 +0000 (UTC) Received: (qmail 16452 invoked by uid 500); 22 Dec 2011 16:15:27 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 16425 invoked by uid 500); 22 Dec 2011 16:15:27 -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 16418 invoked by uid 99); 22 Dec 2011 16:15:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2011 16:15:27 +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, 22 Dec 2011 16:15:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4426B23888E7 for ; Thu, 22 Dec 2011 16:15:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1222319 - in /camel/branches/camel-2.8.x: ./ components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java Date: Thu, 22 Dec 2011 16:15:06 -0000 To: commits@camel.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111222161506.4426B23888E7@eris.apache.org> Author: dkulp Date: Thu Dec 22 16:15:05 2011 New Revision: 1222319 URL: http://svn.apache.org/viewvc?rev=1222319&view=rev Log: Merged revisions 1209475 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1209475 | ningjiang | 2011-12-02 08:38:20 -0500 (Fri, 02 Dec 2011) | 1 line CAMEL-4732 updated the cached time value of the test ........ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java?rev=1222319&r1=1222318&r2=1222319&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java (original) +++ camel/branches/camel-2.8.x/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java Thu Dec 22 16:15:05 2011 @@ -92,7 +92,7 @@ public class FreemarkerContentCacheTest mock.assertIsSatisfied(); // now change content in the file in the classpath and try again .... after delaying longer than the cache update delay - Thread.sleep(5000); + Thread.sleep(2000); template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/freemarker?fileExist=Override", "Bye ${headers.name}", Exchange.FILE_NAME, "hello.ftl"); mock.reset(); @@ -110,7 +110,7 @@ public class FreemarkerContentCacheTest from("direct:b").to("freemarker://org/apache/camel/component/freemarker/hello.ftl?contentCache=true").to("mock:result"); - from("direct:c").to("freemarker://org/apache/camel/component/freemarker/hello.ftl?contentCache=true&templateUpdateDelay=4").to("mock:result"); + from("direct:c").to("freemarker://org/apache/camel/component/freemarker/hello.ftl?contentCache=true&templateUpdateDelay=1").to("mock:result"); } }; }