Author: davsclaus
Date: Thu Jan  3 10:56:12 2013
New Revision: 1428272

URL: http://svn.apache.org/viewvc?rev=1428272&view=rev
Log:
CAMEL-5906: Added new camel-servletlistener component for bootstrapping Camel 
in web app without using spring etc. Work in progress.

Added:
    
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/MultipleRoutesTest.java
   (with props)
    
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/SingleRouteTest.java
      - copied, changed from r1428260, 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/CamelContextServletListenerTest.java
    camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml
      - copied, changed from r1428267, 
camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml
Modified:
    
camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java

Modified: 
camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java?rev=1428272&r1=1428271&r2=1428272&view=diff
==============================================================================
--- 
camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java
 (original)
+++ 
camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java
 Thu Jan  3 10:56:12 2013
@@ -17,9 +17,12 @@
 package org.apache.camel.component.servletlistener;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -45,11 +48,9 @@ import org.slf4j.LoggerFactory;
  */
 public class CamelContextServletListener implements ServletContextListener {
 
-    // TODO: Allow to lookup and configure some of the stuff we do in 
camel-core-xml
-    // more easily with this listener as well
-    // TODO: Add more tests
-    // TODO: Allow to lookup route builders using package scanning
-
+    /**
+     * instance is used for testing purpose
+     */
     public static ServletCamelContext instance;
 
     private static final Logger LOG = 
LoggerFactory.getLogger(CamelContextServletListener.class);
@@ -92,41 +93,37 @@ public class CamelContextServletListener
         }
 
         // get the routes and add to the CamelContext
-        Map<String, Object> routes = extractRoutes(map);
-        for (Map.Entry<String, Object> entry : routes.entrySet()) {
-            if (entry.getValue() instanceof RouteBuilder) {
-                LOG.debug("Adding route(s) {} -> {}", entry.getKey(), 
entry.getValue());
+        List<Object> routes = extractRoutes(map);
+        for (Object route : routes) {
+            if (route instanceof RouteBuilder) {
                 try {
-                    camelContext.addRoutes((RoutesBuilder) entry.getValue());
+                    camelContext.addRoutes((RoutesBuilder) route);
                 } catch (Exception e) {
-                    throw new RuntimeException("Error adding route(s) " + 
entry.getKey(), e);
+                    throw new RuntimeException("Error adding route " + route, 
e);
                 }
-            } else if (entry.getValue() instanceof Set) {
+            } else if (route instanceof Set) {
                 // its a set of route builders
-                for (Object clazz : (Set) entry.getValue()) {
-                    LOG.debug("Adding route(s) {} -> {}", entry.getKey(), 
clazz);
+                for (Object clazz : (Set) route) {
                     try {
                         camelContext.addRoutes((RoutesBuilder) clazz);
                     } catch (Exception e) {
-                        throw new RuntimeException("Error adding route(s) " + 
entry.getKey(), e);
+                        throw new RuntimeException("Error adding route " + 
clazz, e);
                     }
                 }
-            } else if (entry.getValue() instanceof RoutesDefinition) {
-                LOG.debug("Adding routes {} -> {}", entry.getKey(), 
entry.getValue());
+            } else if (route instanceof RoutesDefinition) {
                 try {
-                    camelContext.addRouteDefinitions(((RoutesDefinition) 
entry.getValue()).getRoutes());
+                    camelContext.addRouteDefinitions(((RoutesDefinition) 
route).getRoutes());
                 } catch (Exception e) {
-                    throw new RuntimeException("Error adding route(s) " + 
entry.getKey(), e);
+                    throw new RuntimeException("Error adding route(s) " + 
route, e);
                 }
-            } else if (entry.getValue() instanceof RouteDefinition) {
-                LOG.debug("Adding routes {} -> {}", entry.getKey(), 
entry.getValue());
+            } else if (route instanceof RouteDefinition) {
                 try {
-                    camelContext.addRouteDefinition((RouteDefinition) 
entry.getValue());
+                    camelContext.addRouteDefinition((RouteDefinition) route);
                 } catch (Exception e) {
-                    throw new RuntimeException("Error adding route(s) " + 
entry.getKey(), e);
+                    throw new RuntimeException("Error adding route(s) " + 
route, e);
                 }
             } else {
-                throw new IllegalArgumentException("Unsupported route " + 
entry.getKey() + " of type: " + entry.getValue().getClass().getName());
+                throw new IllegalArgumentException("Unsupported route: " + 
route);
             }
         }
 
@@ -167,65 +164,77 @@ public class CamelContextServletListener
         LOG.info("CamelContextServletListener initialized");
     }
 
-    private Map<String, Object> extractRoutes(Map<String, Object> map) {
-        Map<String, Object> routes = new LinkedHashMap<String, Object>();
+    private List<Object> extractRoutes(Map<String, Object> map) {
+        List<Object> answer = new ArrayList<Object>();
+        List<String> names = new ArrayList<String>();
+
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             if 
(entry.getKey().toLowerCase(Locale.UK).startsWith("routebuilder")) {
+                names.add(entry.getKey());
+                // we can have multiple values assigned, separated by comma, 
so create an iterator
                 String value = (String) entry.getValue();
-                if (ObjectHelper.isNotEmpty(value)) {
-                    Object target = null;
-                    if (value.startsWith("#")) {
-                        // a reference lookup in jndi
-                        value = value.substring(1);
-                        target = lookupJndi(jndiContext, value);
-                    } else if (ResourceHelper.hasScheme(value)) {
-                        InputStream is = null;
-                        try {
-                            is = 
ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext.getClassResolver(),
 value);
-                            target = camelContext.loadRoutesDefinition(is);
-                        } catch (Exception e) {
-                            throw new RuntimeException("Error loading routes 
from resource: " + value, e);
-                        } finally {
-                            IOHelper.close(is, entry.getKey(), LOG);
-                        }
-                    } else if (value.startsWith("packagescan:")) {
-                        // using package scanning
-                        String path = value.substring(12);
-                        Set<Class<?>> classes = 
camelContext.getPackageScanClassResolver().findImplementations(RouteBuilder.class,
 path);
-                        if (!classes.isEmpty()) {
-                            Set<RouteBuilder> builders = new 
LinkedHashSet<RouteBuilder>();
-                            target = builders;
-                            for (Class<?> clazz : classes) {
-                                try {
-                                    RouteBuilder route = (RouteBuilder) 
camelContext.getInjector().newInstance(clazz);
-                                    builders.add(route);
-                                } catch (Exception e) {
-                                    throw new RuntimeException("Error creating 
RouteBuilder " + clazz, e);
+                Iterator it = ObjectHelper.createIterator(value);
+                while (it.hasNext()) {
+                    value = (String) it.next();
+                    if (ObjectHelper.isNotEmpty(value)) {
+                        // trim value before usage, as people can indent the 
values
+                        value = value.trim();
+                        Object target = null;
+
+                        if (value.startsWith("#")) {
+                            // a reference lookup in jndi
+                            value = value.substring(1);
+                            target = lookupJndi(jndiContext, value);
+                        } else if (ResourceHelper.hasScheme(value)) {
+                            // XML resource from classpath or file system
+                            InputStream is = null;
+                            try {
+                                is = 
ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext.getClassResolver(),
 value);
+                                target = camelContext.loadRoutesDefinition(is);
+                            } catch (Exception e) {
+                                throw new RuntimeException("Error loading 
routes from resource: " + value, e);
+                            } finally {
+                                IOHelper.close(is, entry.getKey(), LOG);
+                            }
+                        } else if (value.startsWith("packagescan:")) {
+                            // using package scanning
+                            String path = value.substring(12);
+                            Set<Class<?>> classes = 
camelContext.getPackageScanClassResolver().findImplementations(RouteBuilder.class,
 path);
+                            if (!classes.isEmpty()) {
+                                Set<RouteBuilder> builders = new 
LinkedHashSet<RouteBuilder>();
+                                target = builders;
+                                for (Class<?> clazz : classes) {
+                                    try {
+                                        RouteBuilder route = (RouteBuilder) 
camelContext.getInjector().newInstance(clazz);
+                                        builders.add(route);
+                                    } catch (Exception e) {
+                                        throw new RuntimeException("Error 
creating RouteBuilder " + clazz, e);
+                                    }
                                 }
                             }
+                        } else {
+                            // assume its a FQN classname for a RouteBuilder 
class
+                            try {
+                                Class<RouteBuilder> clazz = 
camelContext.getClassResolver().resolveMandatoryClass(value, 
RouteBuilder.class);
+                                target = 
camelContext.getInjector().newInstance(clazz);
+                            } catch (Exception e) {
+                                throw new RuntimeException("Error creating 
RouteBuilder " + value, e);
+                            }
                         }
-                    } else {
-                        // assume its a FQN classname for a RouteBuilder class
-                        try {
-                            Class<RouteBuilder> clazz = 
camelContext.getClassResolver().resolveMandatoryClass(value, 
RouteBuilder.class);
-                            target = 
camelContext.getInjector().newInstance(clazz);
-                        } catch (Exception e) {
-                            throw new RuntimeException("Error creating 
RouteBuilder " + value, e);
+                        if (target != null) {
+                            answer.add(target);
                         }
                     }
-                    if (target != null) {
-                        routes.put(entry.getKey(), target);
-                    }
                 }
             }
         }
 
         // after adding the route builders we should remove them from the map
-        for (String name : routes.keySet()) {
+        for (String name : names) {
             map.remove(name);
         }
 
-        return routes;
+        return answer;
     }
 
     private Map<String, Object> extractInitParameters(ServletContextEvent sce) 
{

Added: 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/MultipleRoutesTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/MultipleRoutesTest.java?rev=1428272&view=auto
==============================================================================
--- 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/MultipleRoutesTest.java
 (added)
+++ 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/MultipleRoutesTest.java
 Thu Jan  3 10:56:12 2013
@@ -0,0 +1,56 @@
+/**
+ * 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.component.servletlistener;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class MultipleRoutesTest extends ServletCamelTestSupport {
+
+    protected String getConfiguration() {
+        return "/myweb4.xml";
+    }
+
+    @Test
+    public void testCamelContext() throws Exception {
+        CamelContext context = getCamelContext();
+        assertNotNull(context);
+
+        assertEquals("MyCamel", context.getName());
+        assertEquals(2, context.getRoutes().size());
+
+        ProducerTemplate template = context.createProducerTemplate();
+
+        MockEndpoint mock = context.getEndpoint("mock:foo", 
MockEndpoint.class);
+        mock.expectedMessageCount(1);
+        MockEndpoint mock2 = context.getEndpoint("mock:bar", 
MockEndpoint.class);
+        mock2.expectedMessageCount(1);
+
+        template.sendBody("seda:foo", "Hello World");
+        template.sendBody("direct:bar", "Bye World");
+
+        mock.assertIsSatisfied();
+        mock2.assertIsSatisfied();
+        template.stop();
+    }
+
+}

Propchange: 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/MultipleRoutesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/MultipleRoutesTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/SingleRouteTest.java
 (from r1428260, 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/CamelContextServletListenerTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/SingleRouteTest.java?p2=camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/SingleRouteTest.java&p1=camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/CamelContextServletListenerTest.java&r1=1428260&r2=1428272&rev=1428272&view=diff
==============================================================================
--- 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/CamelContextServletListenerTest.java
 (original)
+++ 
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/SingleRouteTest.java
 Thu Jan  3 10:56:12 2013
@@ -24,7 +24,7 @@ import org.junit.Test;
 /**
  *
  */
-public class CamelContextServletListenerTest extends ServletCamelTestSupport {
+public class SingleRouteTest extends ServletCamelTestSupport {
 
     protected String getConfiguration() {
         return "/myweb.xml";

Copied: 
camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml 
(from r1428267, 
camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml)
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml?p2=camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml&p1=camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml&r1=1428267&r2=1428272&rev=1428272&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml 
(original)
+++ camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml 
Thu Jan  3 10:56:12 2013
@@ -40,9 +40,12 @@
   <!-- configure a route builder to use -->
   <!-- Camel will pickup any parameter names that start with routeBuilder 
(case ignored) -->
   <context-param>
-    <param-name>routeBuilder-MyRoute</param-name>
-    <!-- define the routes using package scanning by prefixing with 
packagescan: -->
-    
<param-value>packagescan:org.apache.camel.component.servletlistener.routes</param-value>
+    <param-name>routeBuilder-routes</param-name>
+    <!-- we can define multiple values separated by comma -->
+    <param-value>
+      org.apache.camel.component.servletlistener.MyRoute,
+      org.apache.camel.component.servletlistener.routes.BarRouteBuilder
+    </param-value>
   </context-param>
 
   <listener>


Reply via email to