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:27:25 UTC
svn commit: r575596 - in /activemq/camel/trunk: ./
components/camel-groovy/src/main/java/groovy/
components/camel-groovy/src/main/java/groovy/runtime/
components/camel-groovy/src/main/java/groovy/runtime/metaclass/
components/camel-groovy/src/main/java...
Author: jstrachan
Date: Fri Sep 14 02:27:19 2007
New Revision: 575596
URL: http://svn.apache.org/viewvc?rev=575596&view=rev
Log:
improved groovy support - which depends on GROOVY-2116 being applied
Added:
activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/
activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/
activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/
activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/
activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/
activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/camel/
activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/camel/model/
activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/camel/model/ProcessorTypeMetaClass.java (with props)
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java (contents, props changed)
- copied, changed from r574905, activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/CamelGroovyMethods.java
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java (with props)
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java (with props)
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java (contents, props changed)
- copied, changed from r574905, activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteBuilder.java
activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/
activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/apache/
activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/apache/camel/
activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/apache/camel/language/
activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/apache/camel/language/groovy
- copied, changed from r574905, activemq/camel/trunk/components/camel-ognl/src/main/resources/META-INF/services/org/apache/camel/language/ognl
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/
- copied from r574905, activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
- copied, changed from r574905, activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java
- copied, changed from r574905, activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/GroovyLanguageTest.java
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java (contents, props changed)
- copied, changed from r574905, activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/groovy/GroovyTest.java
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java
- copied, changed from r574905, activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/language/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/language/groovy/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/language/groovy/example/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/language/groovy/example/GroovyRoutes.groovy
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/processor/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/processor/groovy/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/processor/groovy/groovyFilter.xml
- copied unchanged from r574905, activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/groovyFilter.xml
Removed:
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/groovy/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/groovy/
activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java
activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/GroovyLanguageTest.java
Modified:
activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/groovy/groovyMethods
activemq/camel/trunk/pom.xml
Added: activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/camel/model/ProcessorTypeMetaClass.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/camel/model/ProcessorTypeMetaClass.java?rev=575596&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/camel/model/ProcessorTypeMetaClass.java (added)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/camel/model/ProcessorTypeMetaClass.java Fri Sep 14 02:27:19 2007
@@ -0,0 +1,55 @@
+/**
+ *
+ * Copyright 2004 James Strachan
+ *
+ * Licensed 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 groovy.runtime.metaclass.org.apache.camel.model;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import groovy.lang.MetaClassImpl;
+import groovy.lang.MetaClassRegistry;
+import org.apache.camel.language.groovy.CamelGroovyMethods;
+import org.apache.camel.model.ProcessorType;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class ProcessorTypeMetaClass extends MetaClassImpl {
+ public ProcessorTypeMetaClass(MetaClassRegistry metaClassRegistry, Class aClass) {
+ super(metaClassRegistry, aClass);
+ }
+
+ @Override
+ public synchronized void initialize() {
+ //addNewInstanceMethodsFrom(CamelGroovyMethods.class, theClass);
+ addNewInstanceMethodsFrom(CamelGroovyMethods.class, ProcessorType.class);
+ super.initialize();
+ }
+
+ protected void addNewInstanceMethodsFrom(Class type, Class ownerType) {
+ Method[] methods = type.getMethods();
+ for (Method method : methods) {
+ int modifiers = method.getModifiers();
+ if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers)) {
+ Class<?>[] classes = method.getParameterTypes();
+ if (classes.length > 0 && classes[0].equals(ownerType)) {
+ addNewInstanceMethod(method);
+ }
+ }
+ }
+ }
+}
Propchange: activemq/camel/trunk/components/camel-groovy/src/main/java/groovy/runtime/metaclass/org/apache/camel/model/ProcessorTypeMetaClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java (from r574905, activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/CamelGroovyMethods.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java?p2=activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java&p1=activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/CamelGroovyMethods.java&r1=574905&r2=575596&rev=575596&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/CamelGroovyMethods.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java Fri Sep 14 02:27:19 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.groovy;
+package org.apache.camel.language.groovy;
import groovy.lang.Closure;
import org.apache.camel.Exchange;
Propchange: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java?rev=575596&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java (added)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java Fri Sep 14 02:27:19 2007
@@ -0,0 +1,72 @@
+/**
+ *
+ * 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.groovy;
+
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.Set;
+
+import groovy.lang.Binding;
+import groovy.lang.Script;
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.ExpressionSupport;
+import org.apache.camel.util.ExchangeHelper;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class GroovyExpression extends ExpressionSupport<Exchange> {
+ private Class<Script> scriptType;
+ private String text;
+
+ public GroovyExpression(Class<Script> scriptType, String text) {
+ this.scriptType = scriptType;
+ this.text = text;
+ }
+
+ @Override
+ public String toString() {
+ return "groovy: " + text;
+ }
+
+ protected String assertionFailureMessage(Exchange exchange) {
+ return "groovy: " + text;
+ }
+
+ public Object evaluate(Exchange exchange) {
+ Script script = ExchangeHelper.newInstance(exchange, scriptType);
+ // lets configure the script
+ configure(exchange, script);
+ return script.run();
+ }
+
+ private void configure(Exchange exchange, Script script) {
+ final Binding binding = script.getBinding();
+ ExchangeHelper.populateVariableMap(exchange, new AbstractMap<String, Object>() {
+ @Override
+ public Object put(String key, Object value) {
+ binding.setProperty(key, value);
+ return null;
+ }
+
+ public Set entrySet() {
+ return Collections.EMPTY_SET;
+ }
+ });
+ }
+}
Propchange: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java?rev=575596&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java (added)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java Fri Sep 14 02:27:19 2007
@@ -0,0 +1,46 @@
+/**
+ *
+ * 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.groovy;
+
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.Script;
+import org.apache.camel.spi.Language;
+import org.apache.camel.Expression;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class GroovyLanguage implements Language {
+
+ public static GroovyExpression groovy(String expression) {
+ return new GroovyLanguage().createExpression(expression);
+ }
+
+ public GroovyExpression createPredicate(String expression) {
+ return createExpression(expression);
+ }
+
+ public GroovyExpression createExpression(String expression) {
+ Class<Script> scriptType = parseExpression(expression);
+ return new GroovyExpression(scriptType, expression);
+ }
+
+ protected Class<Script> parseExpression(String expression) {
+ return new GroovyClassLoader().parseClass(expression);
+ }
+}
Propchange: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java (from r574905, activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteBuilder.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java?p2=activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java&p1=activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteBuilder.java&r1=574905&r2=575596&rev=575596&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteBuilder.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java Fri Sep 14 02:27:19 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.groovy;
+package org.apache.camel.language.groovy;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
Propchange: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/groovy/groovyMethods
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/groovy/groovyMethods?rev=575596&r1=575595&r2=575596&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/groovy/groovyMethods (original)
+++ activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/groovy/groovyMethods Fri Sep 14 02:27:19 2007
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.camel.groovy.CamelGroovyMethods
\ No newline at end of file
+org.apache.camel.language.groovy.CamelGroovyMethods
\ No newline at end of file
Copied: activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/apache/camel/language/groovy (from r574905, activemq/camel/trunk/components/camel-ognl/src/main/resources/META-INF/services/org/apache/camel/language/ognl)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/apache/camel/language/groovy?p2=activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/apache/camel/language/groovy&p1=activemq/camel/trunk/components/camel-ognl/src/main/resources/META-INF/services/org/apache/camel/language/ognl&r1=574905&r2=575596&rev=575596&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ognl/src/main/resources/META-INF/services/org/apache/camel/language/ognl (original)
+++ activemq/camel/trunk/components/camel-groovy/src/main/resources/META-INF/services/org/apache/camel/language/groovy Fri Sep 14 02:27:19 2007
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.language.ognl.OgnlLanguage
\ No newline at end of file
+class=org.apache.camel.language.groovy.GroovyLanguage
\ No newline at end of file
Copied: activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java (from r574905, activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java?p2=activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java&p1=activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java&r1=574905&r2=575596&rev=575596&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java Fri Sep 14 02:27:19 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.script;
+package org.apache.camel.language.groovy;
import org.apache.camel.Exchange;
import org.apache.camel.TestSupport;
@@ -23,44 +23,38 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.camel.builder.script.ScriptBuilder.groovy;
-
/**
* @version $Revision$
*/
-public class GroovyTest extends TestSupport {
+public class GroovyExpressionTest extends TestSupport {
private static final transient Log LOG = LogFactory.getLog(GroovyTest.class);
protected Exchange exchange;
public void testExpressionReturnsTheCorrectValue() throws Exception {
- assertExpression(groovy("exchange.in.headers['foo.bar']"), exchange, "cheese");
- assertExpression(groovy("exchange.in.headers.name"), exchange, "James");
- assertExpression(groovy("exchange.in.headers['doesNotExist']"), exchange, null);
+ assertExpression(GroovyLanguage.groovy("exchange.in.headers['foo.bar']"), exchange, "cheese");
+ assertExpression(GroovyLanguage.groovy("exchange.in.headers.name"), exchange, "James");
+ assertExpression(GroovyLanguage.groovy("exchange.in.headers['doesNotExist']"), exchange, null);
}
public void testPredicateEvaluation() throws Exception {
- assertPredicate(groovy("exchange.in.headers.name == 'James'"), exchange, true);
- assertPredicate(groovy("exchange.in.headers.name == 'Hiram'"), exchange, false);
+ assertPredicate(GroovyLanguage.groovy("exchange.in.headers.name == 'James'"), exchange, true);
+ assertPredicate(GroovyLanguage.groovy("exchange.in.headers.name == 'Hiram'"), exchange, false);
- assertPredicate(groovy("request.headers.name == 'James'"), exchange, true);
+ assertPredicate(GroovyLanguage.groovy("request.headers.name == 'James'"), exchange, true);
}
public void testProcessorMutatesTheExchange() throws Exception {
- groovy("request.headers.myNewHeader = 'ABC'").process(exchange);
+ GroovyLanguage.groovy("request.headers.myNewHeader = 'ABC'").evaluate(exchange);
assertInMessageHeader(exchange, "myNewHeader", "ABC");
}
- public void testPredicateUsingScriptAttribute() throws Exception {
- assertPredicate(groovy("request.headers.name == hacker").attribute("hacker", "James"), exchange, true);
- }
-
public void testInvalidExpressionFailsWithMeaningfulException() throws Exception {
try {
- groovy("exchange.doesNotExist").evaluate(exchange);
+ GroovyLanguage.groovy("exchange.doesNotExist").evaluate(exchange);
fail("This test case should have thrown an exception!");
- } catch (ScriptEvaluationException e) {
+ } catch (Exception e) {
LOG.debug("Caught expected exception: " + e, e);
String message = e.getMessage();
assertTrue("The message should include 'doesNotExist' but was: " + message, message.contains("doesNotExist"));
@@ -73,4 +67,4 @@
exchange.getIn().setHeader("foo.bar", "cheese");
exchange.getIn().setHeader("name", "James");
}
-}
+}
\ No newline at end of file
Copied: activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java (from r574905, 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-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java?p2=activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java&p1=activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/GroovyLanguageTest.java&r1=574905&r2=575596&rev=575596&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/GroovyLanguageTest.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java Fri Sep 14 02:27:19 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.language.script;
+package org.apache.camel.language.groovy;
import org.apache.camel.LanguageTestSupport;
@@ -31,4 +31,4 @@
protected String getLanguageName() {
return "groovy";
}
-}
+}
\ No newline at end of file
Copied: activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java (from r574905, activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/groovy/GroovyTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java?p2=activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java&p1=activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/groovy/GroovyTest.java&r1=574905&r2=575596&rev=575596&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/groovy/GroovyTest.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java Fri Sep 14 02:27:19 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.groovy;
+package org.apache.camel.language.groovy;
import groovy.lang.GroovyClassLoader;
import groovy.lang.MetaClassRegistry;
@@ -33,9 +33,11 @@
*/
public class GroovyTest extends ContextTestSupport {
protected String expected = "<hello>world!</hello>";
- protected String groovyBuilderClass = "org.apache.camel.groovy.example.GroovyRoutes";
+ protected String groovyBuilderClass = "org.apache.camel.language.groovy.example.GroovyRoutes";
public void testSendMatchingMessage() throws Exception {
+ System.out.println(">>>>> " + ProcessorType.class.getName());
+
MockEndpoint resultEndpoint = getMockEndpoint("mock:results");
resultEndpoint.expectedBodiesReceived(expected);
Propchange: activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java (from r574905, activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java?p2=activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java&p1=activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java&r1=574905&r2=575596&rev=575596&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyFilterTest.java Fri Sep 14 02:27:19 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.script.example;
+package org.apache.camel.processor.groovy;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
@@ -30,11 +30,11 @@
public class GroovyFilterTest extends XPathFilterTest {
@Override
protected CamelContext createCamelContext() throws Exception {
- return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/builder/script/example/groovyFilter.xml"));
+ return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/processor/groovy/groovyFilter.xml"));
}
@Override
protected RouteBuilder createRouteBuilder() {
return NoRouteBuilder.getInstance();
}
-}
+}
\ No newline at end of file
Added: activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/language/groovy/example/GroovyRoutes.groovy
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/language/groovy/example/GroovyRoutes.groovy?rev=575596&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/language/groovy/example/GroovyRoutes.groovy (added)
+++ activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/language/groovy/example/GroovyRoutes.groovy Fri Sep 14 02:27:19 2007
@@ -0,0 +1,14 @@
+package org.apache.camel.language.groovy.example
+
+import org.apache.camel.language.groovy.GroovyRouteBuilder;
+
+class GroovyRoutes extends GroovyRouteBuilder {
+
+ void configure() {
+
+ from("direct:a").filter {e ->
+ e.in.headers.foo == "bar"
+ }.to("mock:results")
+
+ }
+}
\ No newline at end of file
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=575596&r1=575595&r2=575596&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Sep 14 02:27:19 2007
@@ -584,9 +584,9 @@
<version>2.0.0</version>
</dependency>
<dependency>
- <groupId>groovy</groupId>
+ <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.0</version>
+ <version>1.1-beta-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.script</groupId>