Author: davsclaus
Date: Fri Nov 12 09:31:38 2010
New Revision: 1034306
URL: http://svn.apache.org/viewvc?rev=1034306&view=rev
Log:
CAMEL-3334: Fixed beanshell language. Thanks to Aaron Mulder for patch.
Modified:
camel/trunk/components/camel-script/pom.xml
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
Modified: camel/trunk/components/camel-script/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=1034306&r1=1034305&r2=1034306&view=diff
==============================================================================
--- camel/trunk/components/camel-script/pom.xml (original)
+++ camel/trunk/components/camel-script/pom.xml Fri Nov 12 09:31:38 2010
@@ -182,11 +182,6 @@
<includes>
<include>**/*Test.*</include>
</includes>
- <!-- TODO: beanshell doesnt work on java 5 yet with the
bsh-engine we got in pom right now -->
- <excludes>
- <exclude>**/BeanShellScriptRouteTest.*</exclude>
- <exclude>**/BeanShellFilterTest.*</exclude>
- </excludes>
</configuration>
</plugin>
</plugins>
Modified:
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=1034306&r1=1034305&r2=1034306&view=diff
==============================================================================
---
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
(original)
+++
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
Fri Nov 12 09:31:38 2010
@@ -451,7 +451,8 @@ public class ScriptBuilder implements Ex
engine = createScriptEngine();
}
if (compiledScript == null) {
- if (engine instanceof Compilable) {
+ // BeanShell implements Compilable but throws an exception if you
call compile
+ if (engine instanceof Compilable && !isBeanShell()) {
compileScript((Compilable)engine);
}
}
@@ -466,8 +467,8 @@ public class ScriptBuilder implements Ex
try {
engine = manager.getEngineByName(scriptEngineName);
} catch (NoClassDefFoundError ex) {
- LOG.error("Can't load the scriptEngine for " + scriptEngineName +
", the exception is " + ex
- + ", please check the scriptEngine needs jars.");
+ LOG.error("Cannot load the scriptEngine for " + scriptEngineName +
", the exception is " + ex
+ + ", please ensure correct JARs is provided on
classpath.");
}
if (engine == null) {
throw new IllegalArgumentException("No script engine could be
created for: " + getScriptEngineName());
@@ -567,4 +568,7 @@ public class ScriptBuilder implements Ex
return "python".equals(scriptEngineName) ||
"jython".equals(scriptEngineName);
}
+ protected boolean isBeanShell() {
+ return "beanshell".equals(scriptEngineName) ||
"bsh".equals(scriptEngineName);
+ }
}
Modified:
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java?rev=1034306&r1=1034305&r2=1034306&view=diff
==============================================================================
---
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
(original)
+++
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
Fri Nov 12 09:31:38 2010
@@ -64,7 +64,7 @@ public class BeanShellScriptRouteTest ex
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start").choice().
- when(script("beanshell", "request.headers['foo'] =
'bar'")).to("mock:result")
+ when(script("beanshell",
"request.getHeaders().get(\"foo\").equals(\"bar\")")).to("mock:result")
.otherwise().to("mock:unmatched");
}
};
Modified:
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml?rev=1034306&r1=1034305&r2=1034306&view=diff
==============================================================================
---
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
(original)
+++
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
Fri Nov 12 09:31:38 2010
@@ -27,7 +27,7 @@
<route>
<from uri="direct:start"/>
<filter>
- <beanshell>request.headers['testCase'] ==
'testSendMatchingMessage'</beanshell>
+ <language
language="beanshell">request.getHeaders().get("testCase").equals("testSendMatchingMessage")</language>
<to uri="mock:result"/>
</filter>
</route>