You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/11/29 14:03:24 UTC
svn commit: r1040099 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/ main/java/org/apache/camel/impl/
test/java/org/apache/camel/model/ test/resources/org/apache/camel/model/
Author: davsclaus
Date: Mon Nov 29 13:03:23 2010
New Revision: 1040099
URL: http://svn.apache.org/viewvc?rev=1040099&view=rev
Log:
CAMEL-3378: Added loadRoutesDefinition to CamelContext to easily load routes from XML resources.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlTest.java
camel/trunk/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml (contents, props changed)
- copied, changed from r1040057, camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=1040099&r1=1040098&r2=1040099&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Mon Nov 29 13:03:23 2010
@@ -16,6 +16,7 @@
*/
package org.apache.camel;
+import java.io.InputStream;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -24,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.DataFormat;
@@ -339,6 +341,15 @@ public interface CamelContext extends Su
void addRoutes(RoutesBuilder builder) throws Exception;
/**
+ * Loads a collection of route definitions from the given {@link java.io.InputStream}.
+ *
+ * @param is input stream with the route(s) definition to add
+ * @throws Exception if the route definitions could not be loaded for whatever reason
+ * @return the route definitions
+ */
+ RoutesDefinition loadRoutesDefinition(InputStream is) throws Exception;
+
+ /**
* Adds a collection of route definitions to the context
*
* @param routeDefinitions the route(s) definition to add
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1040099&r1=1040098&r2=1040099&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Mon Nov 29 13:03:23 2010
@@ -16,6 +16,8 @@
*/
package org.apache.camel.impl;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -33,6 +35,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import javax.naming.Context;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
@@ -69,8 +73,10 @@ import org.apache.camel.management.Defau
import org.apache.camel.management.DefaultManagementStrategy;
import org.apache.camel.management.JmxSystemPropertyKeys;
import org.apache.camel.management.ManagedManagementStrategy;
+import org.apache.camel.model.Constants;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.processor.interceptor.Debug;
import org.apache.camel.processor.interceptor.Delayer;
import org.apache.camel.processor.interceptor.HandleFault;
@@ -124,6 +130,7 @@ import org.apache.commons.logging.LogFac
*/
public class DefaultCamelContext extends ServiceSupport implements CamelContext, SuspendableService {
private static final transient Log LOG = LogFactory.getLog(DefaultCamelContext.class);
+ private JAXBContext jaxbContext;
private CamelContextNameStrategy nameStrategy = new DefaultCamelContextNameStrategy();
private String managementName;
private ClassLoader applicationContextClassLoader;
@@ -561,6 +568,34 @@ public class DefaultCamelContext extends
builder.addRoutesToCamelContext(this);
}
+ public synchronized RoutesDefinition loadRoutesDefinition(InputStream is) throws Exception {
+ // load routes using JAXB
+ if (jaxbContext == null) {
+ jaxbContext = JAXBContext.newInstance(Constants.JAXB_CONTEXT_PACKAGES);
+ }
+
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ Object result = unmarshaller.unmarshal(is);
+
+ if (result == null) {
+ throw new IOException("Cannot unmarshal to routes using JAXB from input stream: " + is);
+ }
+
+ // can either be routes or a single route
+ RoutesDefinition answer = null;
+ if (result instanceof RouteDefinition) {
+ RouteDefinition route = (RouteDefinition) result;
+ answer = new RoutesDefinition();
+ answer.getRoutes().add(route);
+ } else if (result instanceof RoutesDefinition) {
+ answer = (RoutesDefinition) result;
+ } else {
+ throw new IllegalArgumentException("Unmarshalled object is an unsupported type: " + ObjectHelper.className(result) + " -> " + result);
+ }
+
+ return answer;
+ }
+
public void addRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws Exception {
for (RouteDefinition routeDefinition : routeDefinitions) {
removeRouteDefinition(routeDefinition);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=1040099&r1=1040098&r2=1040099&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Mon Nov 29 13:03:23 2010
@@ -59,7 +59,7 @@ public class DefaultRouteContext impleme
private InterceptStrategy managedInterceptStrategy;
private boolean routeAdded;
private Boolean trace;
- private Boolean stramCache;
+ private Boolean streamCache;
private Boolean handleFault;
private Long delay;
private Boolean autoStartup = Boolean.TRUE;
@@ -244,12 +244,12 @@ public class DefaultRouteContext impleme
}
public void setStreamCaching(Boolean cache) {
- this.stramCache = cache;
+ this.streamCache = cache;
}
public Boolean isStreamCaching() {
- if (stramCache != null) {
- return stramCache;
+ if (streamCache != null) {
+ return streamCache;
} else {
// fallback to the option from camel context
return getCamelContext().isStreamCaching();
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlTest.java?rev=1040099&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlTest.java Mon Nov 29 13:03:23 2010
@@ -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.model;
+
+import java.io.InputStream;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class LoadRouteFromXmlTest extends ContextTestSupport {
+
+ public void testLoadRouteFromXml() throws Exception {
+ assertNotNull("Existing foo route should be there", context.getRoute("foo"));
+ assertEquals(1, context.getRoutes().size());
+
+ // test that existing route works
+ MockEndpoint foo = getMockEndpoint("mock:foo");
+ foo.expectedBodiesReceived("Hello World");
+ template.sendBody("direct:foo", "Hello World");
+ foo.assertIsSatisfied();
+
+ // load route from XML
+ InputStream is = getClass().getResourceAsStream("barRoute.xml");
+ RoutesDefinition routes = context.loadRoutesDefinition(is);
+ context.addRouteDefinitions(routes.getRoutes());
+
+ assertNotNull("Loaded bar route should be there", context.getRoute("bar"));
+ assertEquals(2, context.getRoutes().size());
+
+ // test that loaded route works
+ MockEndpoint bar = getMockEndpoint("mock:bar");
+ bar.expectedBodiesReceived("Bye World");
+ template.sendBody("direct:bar", "Bye World");
+ bar.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:foo").routeId("foo")
+ .to("mock:foo");
+ }
+ };
+ }
+}
Copied: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml (from r1040057, camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml?p2=camel/trunk/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml&p1=camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml&r1=1040057&r2=1040099&rev=1040099&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml (original)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml Mon Nov 29 13:03:23 2010
@@ -15,15 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<routes xmlns="http://camel.apache.org/schema/spring"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <!--
- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"
- -->
-
- <route>
- <from uri="seda:a"/>
- <to uri="seda:b"/>
- </route>
+<routes xmlns="http://camel.apache.org/schema/spring">
+ <route id="bar">
+ <from uri="direct:bar"/>
+ <to uri="mock:bar"/>
+ </route>
</routes>
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml