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/12 07:03:53 UTC
svn commit: r574788 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/model/ components/
components/camel-groovy/ components/camel-gr...
Author: jstrachan
Date: Tue Sep 11 22:03:51 2007
New Revision: 574788
URL: http://svn.apache.org/viewvc?rev=574788&view=rev
Log:
initial spike of a groovy DSL for Camel for CAMEL-144
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java (with props)
activemq/camel/trunk/components/camel-groovy/
activemq/camel/trunk/components/camel-groovy/pom.xml (with props)
activemq/camel/trunk/components/camel-groovy/src/
activemq/camel/trunk/components/camel-groovy/src/main/
activemq/camel/trunk/components/camel-groovy/src/main/java/
activemq/camel/trunk/components/camel-groovy/src/main/java/org/
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyNodeFactory.java (with props)
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteBuilder.java (with props)
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteType.java (with props)
activemq/camel/trunk/components/camel-groovy/src/main/resources/
activemq/camel/trunk/components/camel-groovy/src/test/
activemq/camel/trunk/components/camel-groovy/src/test/java/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/
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/groovy/GroovyTest.java (with props)
activemq/camel/trunk/components/camel-groovy/src/test/resources/
activemq/camel/trunk/components/camel-groovy/src/test/resources/log4j.properties (with props)
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/groovy/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/groovy/example/
activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/groovy/example/GroovyRoutes.groovy
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java
activemq/camel/trunk/components/pom.xml
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=574788&r1=574787&r2=574788&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Tue Sep 11 22:03:51 2007
@@ -46,14 +46,20 @@
private RoutesType routeCollection = new RoutesType();
private List<Route> routes = new ArrayList<Route>();
- protected RouteBuilder() {
+ public RouteBuilder() {
this(null);
}
- protected RouteBuilder(CamelContext context) {
+ public RouteBuilder(CamelContext context) {
super(context);
}
+
+ @Override
+ public String toString() {
+ return routeCollection.toString();
+ }
+
/**
* Called on initialization to to build the required destinationBuilders
*/
@@ -170,6 +176,10 @@
}
routeCollection.setCamelContext(camelContext);
camelContext.addRouteDefinitions(routeCollection.getRoutes());
+ }
+
+ public void setRouteCollection(RoutesType routeCollection) {
+ this.routeCollection = routeCollection;
}
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=574788&r1=574787&r2=574788&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Tue Sep 11 22:03:51 2007
@@ -299,8 +299,9 @@
public void addRoutes(RouteBuilder builder) throws Exception {
// lets now add the routes from the builder
builder.setContext(this);
- LOG.debug("Adding routes from: " + builder);
- addRoutes(builder.getRouteList());
+ List<Route> routeList = builder.getRouteList();
+ LOG.debug("Adding routes from: " + builder + " routes: " + routeList);
+ addRoutes(routeList);
}
public void addRouteDefinitions(Collection<RouteType> routeDefinitions) throws Exception {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?rev=574788&r1=574787&r2=574788&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java Tue Sep 11 22:03:51 2007
@@ -99,6 +99,7 @@
@Override
protected void configureChild(ProcessorType output) {
+ super.configureChild(output);
if (isInheritErrorHandler()) {
output.setErrorHandlerBuilder(getErrorHandlerBuilder());
}
Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java?rev=574788&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java Tue Sep 11 22:03:51 2007
@@ -0,0 +1,34 @@
+/**
+ *
+ * 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.model;
+
+/**
+ * A simple factory used to create new child nodes which allows pluggable extension points
+ * such as to add extra DSL helper methods such as for the Groovy or Ruby DSLs
+ *
+ * @version $Revision: 1.1 $
+ */
+public class NodeFactory {
+ public FilterType createFilter() {
+ return new FilterType();
+ }
+
+ public RouteType createRoute() {
+ return new RouteType();
+ }
+}
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java?rev=574788&r1=574787&r2=574788&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java Tue Sep 11 22:03:51 2007
@@ -66,6 +66,7 @@
@Override
protected void configureChild(ProcessorType output) {
+ super.configureChild(output);
if (isInheritErrorHandler()) {
output.setErrorHandlerBuilder(getErrorHandlerBuilder());
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=574788&r1=574787&r2=574788&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Tue Sep 11 22:03:51 2007
@@ -58,6 +58,7 @@
private ErrorHandlerBuilder errorHandlerBuilder;
private Boolean inheritErrorHandlerFlag = Boolean.TRUE; // TODO not sure how
private DelegateProcessor lastInterceptor;
+ private NodeFactory nodeFactory;
// else to use an
// optional
// attribute in
@@ -453,7 +454,7 @@
}
public FilterType filter(ExpressionType expression) {
- FilterType filter = new FilterType();
+ FilterType filter = getNodeFactory().createFilter();
filter.setExpression(expression);
addOutput(filter);
return filter;
@@ -699,6 +700,18 @@
this.inheritErrorHandlerFlag = inheritErrorHandlerFlag;
}
+ @XmlTransient
+ public NodeFactory getNodeFactory() {
+ if (nodeFactory == null) {
+ nodeFactory = new NodeFactory();
+ }
+ return nodeFactory;
+ }
+
+ public void setNodeFactory(NodeFactory nodeFactory) {
+ this.nodeFactory = nodeFactory;
+ }
+
/**
* Returns a label to describe this node such as the expression if some kind of expression node
*
@@ -780,6 +793,7 @@
}
protected void configureChild(ProcessorType output) {
+ output.setNodeFactory(getNodeFactory());
}
protected void addOutput(ProcessorType processorType) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java?rev=574788&r1=574787&r2=574788&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java Tue Sep 11 22:03:51 2007
@@ -63,11 +63,11 @@
}
public RouteType(String uri) {
- getInputs().add(new FromType(uri));
+ from(uri);
}
public RouteType(Endpoint endpoint) {
- getInputs().add(new FromType(endpoint));
+ from(endpoint);
}
@Override
@@ -111,6 +111,14 @@
return this;
}
+ /**
+ * Creates an input to the route
+ */
+ public RouteType from(Endpoint endpoint) {
+ getInputs().add(new FromType(endpoint));
+ return this;
+ }
+
// Properties
// -----------------------------------------------------------------------
@@ -182,6 +190,8 @@
@Override
protected void configureChild(ProcessorType output) {
+ super.configureChild(output);
+
if (isInheritErrorHandler()) {
output.setErrorHandlerBuilder(getErrorHandlerBuilder());
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java?rev=574788&r1=574787&r2=574788&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java Tue Sep 11 22:03:51 2007
@@ -125,7 +125,7 @@
* Creates a new route
*/
public RouteType route() {
- RouteType route = new RouteType();
+ RouteType route = createRoute();
return route(route);
}
@@ -133,7 +133,8 @@
* Creates a new route from the given URI input
*/
public RouteType from(String uri) {
- RouteType route = new RouteType(uri);
+ RouteType route = createRoute();
+ route.from(uri);
return route(route);
}
@@ -141,7 +142,8 @@
* Creates a new route from the given endpoint
*/
public RouteType from(Endpoint endpoint) {
- RouteType route = new RouteType(endpoint);
+ RouteType route = createRoute();
+ route.from(endpoint);
return route(route);
}
@@ -178,4 +180,12 @@
getExceptions().add(answer);
return answer;
}
+
+
+ // Implementation methods
+ //-------------------------------------------------------------------------
+ protected RouteType createRoute() {
+ return new RouteType();
+ }
+
}
Added: activemq/camel/trunk/components/camel-groovy/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/pom.xml?rev=574788&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/pom.xml (added)
+++ activemq/camel/trunk/components/camel-groovy/pom.xml Tue Sep 11 22:03:51 2007
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-groovy</artifactId>
+ <name>Camel :: Groovy</name>
+ <description>Camel Groovy support</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
+
+
Propchange: activemq/camel/trunk/components/camel-groovy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyNodeFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyNodeFactory.java?rev=574788&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyNodeFactory.java (added)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyNodeFactory.java Tue Sep 11 22:03:51 2007
@@ -0,0 +1,26 @@
+/**
+ *
+ * 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.groovy;
+
+import org.apache.camel.model.NodeFactory;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class GroovyNodeFactory extends NodeFactory {
+}
Propchange: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyNodeFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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/groovy/GroovyRouteBuilder.java?rev=574788&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteBuilder.java (added)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteBuilder.java Tue Sep 11 22:03:51 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.groovy;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteType;
+import org.apache.camel.model.RoutesType;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public abstract class GroovyRouteBuilder extends RouteBuilder {
+ public GroovyRouteBuilder() {
+ init();
+ }
+
+ public GroovyRouteBuilder(CamelContext context) {
+ super(context);
+ init();
+ }
+
+ private void init() {
+ setRouteCollection(new RoutesType() {
+ @Override
+ protected RouteType createRoute() {
+ return new GroovyRouteType();
+ }
+ });
+ }
+}
Propchange: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteType.java?rev=574788&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteType.java (added)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteType.java Tue Sep 11 22:03:51 2007
@@ -0,0 +1,65 @@
+/**
+ *
+ * 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.groovy;
+
+import groovy.lang.Closure;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Predicate;
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.ExpressionSupport;
+import org.apache.camel.model.FilterType;
+import org.apache.camel.model.RouteType;
+
+/**
+ * Adds some groovy helper methods
+ *
+ * @version $Revision: 1.1 $
+ */
+public class GroovyRouteType extends RouteType {
+ public GroovyRouteType() {
+ }
+
+ public GroovyRouteType(Endpoint endpoint) {
+ super(endpoint);
+ }
+
+ public GroovyRouteType(String uri) {
+ super(uri);
+ }
+
+ public FilterType filter(Closure filter) {
+ return super.filter(asPredicate(filter));
+ }
+
+ protected Predicate asPredicate(final Closure filter) {
+ return new ExpressionSupport<Exchange>() {
+ protected String assertionFailureMessage(Exchange exchange) {
+ return filter.toString();
+ }
+
+ public Object evaluate(Exchange exchange) {
+ return filter.call(exchange);
+ }
+
+ @Override
+ public String toString() {
+ return "Groovy[" + filter + "]";
+ }
+ };
+ }
+}
Propchange: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/groovy/GroovyRouteType.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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/groovy/GroovyTest.java?rev=574788&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/groovy/GroovyTest.java (added)
+++ activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/groovy/GroovyTest.java Tue Sep 11 22:03:51 2007
@@ -0,0 +1,66 @@
+/**
+ *
+ * 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.groovy;
+
+import groovy.lang.GroovyClassLoader;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class GroovyTest extends ContextTestSupport {
+ protected String expected = "<hello>world!</hello>";
+ protected String groovyBuilderClass = "org.apache.camel.groovy.example.GroovyRoutes";
+
+ public void testSendMatchingMessage() throws Exception {
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:results");
+ resultEndpoint.expectedBodiesReceived(expected);
+
+ template.sendBodyAndHeader("direct:a", expected, "foo", "bar");
+
+ assertMockEndpointsSatisifed();
+ }
+
+ public void testSendNotMatchingMessage() throws Exception {
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:results");
+ resultEndpoint.expectedMessageCount(0);
+
+ template.sendBodyAndHeader("direct:a", expected, "foo", "123");
+
+ assertMockEndpointsSatisifed();
+ }
+
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext answer = super.createCamelContext();
+
+ GroovyClassLoader classLoader = new GroovyClassLoader();
+ Class<?> type = classLoader.loadClass(groovyBuilderClass);
+ Object object = answer.getInjector().newInstance(type);
+ RouteBuilder builder = assertIsInstanceOf(RouteBuilder.class, object);
+
+ log.info("Loaded builder: " + builder);
+ answer.addRoutes(builder);
+
+ return answer;
+ }
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/groovy/GroovyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-groovy/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/test/resources/log4j.properties?rev=574788&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/test/resources/log4j.properties (added)
+++ activemq/camel/trunk/components/camel-groovy/src/test/resources/log4j.properties Tue Sep 11 22:03:51 2007
@@ -0,0 +1,32 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for eclipse testing, We want to see debug output on the console.
+#
+log4j.rootLogger=INFO, out
+
+# uncomment the following to enable debug of Camel
+log4j.logger.org.apache.camel=DEBUG
+
+#log4j.logger.org.apache.activemq=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
Propchange: activemq/camel/trunk/components/camel-groovy/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/groovy/example/GroovyRoutes.groovy
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/groovy/example/GroovyRoutes.groovy?rev=574788&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/groovy/example/GroovyRoutes.groovy (added)
+++ activemq/camel/trunk/components/camel-groovy/src/test/resources/org/apache/camel/groovy/example/GroovyRoutes.groovy Tue Sep 11 22:03:51 2007
@@ -0,0 +1,12 @@
+package org.apache.camel.groovy.example;
+
+import org.apache.camel.groovy.GroovyRouteBuilder
+
+class GroovyRoutes extends GroovyRouteBuilder {
+ protected 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/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=574788&r1=574787&r2=574788&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Tue Sep 11 22:03:51 2007
@@ -38,7 +38,7 @@
<module>camel-bam</module>
<module>camel-cxf</module>
<module>camel-ftp</module>
- <module>camel-juel</module>
+ <module>camel-groovy</module>
<module>camel-http</module>
<module>camel-ibatis</module>
<module>camel-irc</module>
@@ -49,12 +49,14 @@
<module>camel-jms</module>
<module>camel-josql</module>
<module>camel-jpa</module>
+ <module>camel-juel</module>
<module>camel-mail</module>
<module>camel-mina</module>
<module>camel-msv</module>
<module>camel-ognl</module>
<module>camel-quartz</module>
<module>camel-rmi</module>
+ <!--<module>camel-ruby</module>-->
<module>camel-saxon</module>
<module>camel-script</module>
<module>camel-spring</module>