You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/11/07 10:40:48 UTC
svn commit: r1198675 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/language/
test/java/org/apache/camel/component/language/
Author: davsclaus
Date: Mon Nov 7 09:40:47 2011
New Revision: 1198675
URL: http://svn.apache.org/viewvc?rev=1198675&view=rev
Log:
CAMEL-4627: contentCache should be default enabled on language component.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileUpdateTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java?rev=1198675&r1=1198674&r2=1198675&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java Mon Nov 7 09:40:47 2011
@@ -19,7 +19,6 @@ package org.apache.camel.component.langu
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.net.URLEncoder;
import org.apache.camel.Component;
@@ -47,12 +46,16 @@ public class LanguageEndpoint extends Re
private boolean transform = true;
public LanguageEndpoint() {
+ // enable cache by default
+ setContentCache(true);
}
public LanguageEndpoint(String endpointUri, Component component, Language language, Expression expression, String resourceUri) {
super(endpointUri, component, resourceUri);
this.language = language;
this.expression = expression;
+ // enable cache by default
+ setContentCache(true);
}
public Producer createProducer() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java?rev=1198675&r1=1198674&r2=1198675&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java Mon Nov 7 09:40:47 2011
@@ -39,8 +39,8 @@ public class LanguageLoadScriptFromClass
public void configure() throws Exception {
// START SNIPPET: e1
from("direct:start")
- // load the script from the classpath and cache it
- .to("language:simple:classpath:org/apache/camel/component/language/mysimplescript.txt?contentCache=true")
+ // load the script from the classpath
+ .to("language:simple:classpath:org/apache/camel/component/language/mysimplescript.txt")
.to("mock:result");
// END SNIPPET: e1
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java?rev=1198675&r1=1198674&r2=1198675&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java Mon Nov 7 09:40:47 2011
@@ -53,7 +53,7 @@ public class LanguageLoadScriptFromFileC
// START SNIPPET: e1
from("direct:start")
- // use content cache to load the script once and cache it
+ // use content cache to load the script once and cache it (content cache is default enabled)
.to("language:simple:file:target/script/myscript.txt?contentCache=true")
.to("mock:result");
// END SNIPPET: e1
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileUpdateTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileUpdateTest.java?rev=1198675&r1=1198674&r2=1198675&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileUpdateTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileUpdateTest.java Mon Nov 7 09:40:47 2011
@@ -52,8 +52,8 @@ public class LanguageLoadScriptFromFileU
// START SNIPPET: e1
from("direct:start")
- // the script will be loaded on each message
- .to("language:simple:file:target/script/myscript.txt")
+ // the script will be loaded on each message, as we disabled cache
+ .to("language:simple:file:target/script/myscript.txt?contentCache=false")
.to("mock:result");
// END SNIPPET: e1
}