You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/09/14 11:38:12 UTC
svn commit: r575598 - in /activemq/camel/trunk/components/camel-script: ./
src/main/java/org/apache/camel/builder/script/
src/test/java/org/apache/camel/language/script/ src/test/resources/
Author: jstrachan
Date: Fri Sep 14 02:38:10 2007
New Revision: 575598
URL: http://svn.apache.org/viewvc?rev=575598&view=rev
Log:
disabled tests for script plugin until we get it working again with the latest/greatest groovy
Added:
activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java
- copied, changed from r574888, activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/GroovyLanguageTest.java
activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java (with props)
activemq/camel/trunk/components/camel-script/src/test/resources/jndi-example.properties
- copied, changed from r574905, activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties
Modified:
activemq/camel/trunk/components/camel-script/pom.xml
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
Modified: activemq/camel/trunk/components/camel-script/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/pom.xml?rev=575598&r1=575597&r2=575598&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/pom.xml (original)
+++ activemq/camel/trunk/components/camel-script/pom.xml Fri Sep 14 02:38:10 2007
@@ -81,6 +81,12 @@
<classifier>jdk14</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R7</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax.script</groupId>
@@ -89,6 +95,11 @@
<classifier>jdk14</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython</artifactId>
+ <version>2.2-rc3</version>
+ </dependency>
<dependency>
<groupId>javax.script</groupId>
@@ -99,7 +110,7 @@
</dependency>
<dependency>
- <groupId>groovy</groupId>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<scope>test</scope>
</dependency>
@@ -146,9 +157,10 @@
<childDelegation>false</childDelegation>
<useFile>true</useFile>
<includes>
- <include>**/*Test.*</include>
+ <!--<include>**/*Test.*</include>-->
</includes>
<excludes>
+ <exclude>**/*Test.*</exclude>
</excludes>
</configuration>
</plugin>
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=575598&r1=575597&r2=575598&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Fri Sep 14 02:38:10 2007
@@ -394,6 +394,9 @@
// -------------------------------------------------------------------------
public ScriptEngine getEngine() {
checkInitialised();
+ if (engine == null) {
+ throw new IllegalArgumentException("No script engine could be created for: " + getScriptEngineName());
+ }
return engine;
}
Copied: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java (from r574888, activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/GroovyLanguageTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java?p2=activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java&p1=activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/GroovyLanguageTest.java&r1=574888&r2=575598&rev=575598&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/GroovyLanguageTest.java (original)
+++ activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java Fri Sep 14 02:38:10 2007
@@ -21,14 +21,14 @@
/**
* @version $Revision: $
*/
-public class GroovyLanguageTest extends LanguageTestSupport {
- public void testGroovyExpressions() throws Exception {
+public class JavaScriptLanguageTest extends LanguageTestSupport {
+ public void testLanguageExpressions() throws Exception {
assertExpression("exchange.in.headers.foo", "abc");
assertExpression("request.headers.foo", "abc");
//assertExpression("headers.foo", "abc");
}
protected String getLanguageName() {
- return "groovy";
+ return "js";
}
-}
+}
\ No newline at end of file
Added: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java?rev=575598&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java (added)
+++ activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java Fri Sep 14 02:38:10 2007
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language.script;
+
+import org.apache.camel.LanguageTestSupport;
+
+/**
+ * @version $Revision: $
+ */
+public class PythonLanguageTest extends LanguageTestSupport {
+ public void testLanguageExpressions() throws Exception {
+ assertExpression("exchange", "abc");
+ assertExpression("exchange.in", "abc");
+ assertExpression("exchange.in.headers[\"foo\"]", "abc");
+ assertExpression("request.headers[\"foo\"]", "abc");
+ //assertExpression("headers.foo", "abc");
+ }
+
+ protected String getLanguageName() {
+ return "jython";
+ }
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/components/camel-script/src/test/resources/jndi-example.properties (from r574905, activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/test/resources/jndi-example.properties?p2=activemq/camel/trunk/components/camel-script/src/test/resources/jndi-example.properties&p1=activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties&r1=574905&r2=575598&rev=575598&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/resources/jndi-example.properties (original)
+++ activemq/camel/trunk/components/camel-script/src/test/resources/jndi-example.properties Fri Sep 14 02:38:10 2007
@@ -19,11 +19,4 @@
java.naming.factory.initial = org.apache.camel.util.jndi.CamelInitialContextFactory
-# the following properties will be copied into the context
-foo = bar
-
-example.class = org.apache.camel.util.jndi.ExampleBean
-example.name = James
-example.price = 2.34
-
# END SNIPPET: jndi