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 2008/05/22 07:12:51 UTC
svn commit: r659007 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/management/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/model/dataf...
Author: davsclaus
Date: Wed May 21 22:12:49 2008
New Revision: 659007
URL: http://svn.apache.org/viewvc?rev=659007&view=rev
Log:
CAMEL-264: Refactored RouteContext to avoid the spi package being dependent on impl package - thanks to Christian Schneider for the patch
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (with props)
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java (with props)
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteContext.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CompletedPredicate.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.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/FilterType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.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/RecipientListType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.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/RoutingSlipType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java Wed May 21 22:12:49 2008
@@ -24,6 +24,7 @@
import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.spi.LifecycleStrategy;
+import org.apache.camel.spi.RouteContext;
public class DefaultLifecycleStrategy implements LifecycleStrategy {
Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=659007&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Wed May 21 22:12:49 2008
@@ -0,0 +1,195 @@
+/**
+ * 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.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.camel.AsyncProcessor;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.NoSuchEndpointException;
+import org.apache.camel.Processor;
+import org.apache.camel.Route;
+import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
+import org.apache.camel.model.FromType;
+import org.apache.camel.model.ProcessorType;
+import org.apache.camel.model.RouteType;
+import org.apache.camel.processor.Interceptor;
+import org.apache.camel.processor.Pipeline;
+import org.apache.camel.processor.ProceedProcessor;
+import org.apache.camel.processor.UnitOfWorkProcessor;
+import org.apache.camel.spi.RouteContext;
+import org.apache.camel.spi.InterceptStrategy;
+
+/**
+ * The context used to activate new routing rules
+ *
+ * @version $Revision$
+ */
+public class DefaultRouteContext implements RouteContext {
+ private RouteType route;
+ private FromType from;
+ private Collection<Route> routes;
+ private Endpoint<? extends Exchange> endpoint;
+ private List<Processor> eventDrivenProcessors = new ArrayList<Processor>();
+ private Interceptor lastInterceptor;
+ private CamelContext camelContext;
+ private List<InterceptStrategy> interceptStrategies = new ArrayList<InterceptStrategy>();
+
+ public DefaultRouteContext(RouteType route, FromType from, Collection<Route> routes) {
+ this.route = route;
+ this.from = from;
+ this.routes = routes;
+ }
+
+ /**
+ * Only used for lazy construction from inside ExpressionType
+ */
+ public DefaultRouteContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ routes = new ArrayList<Route>();
+ route = new RouteType("temporary");
+ }
+
+ public Endpoint<? extends Exchange> getEndpoint() {
+ if (endpoint == null) {
+ endpoint = from.resolveEndpoint(this);
+ }
+ return endpoint;
+ }
+
+ public FromType getFrom() {
+ return from;
+ }
+
+ public RouteType getRoute() {
+ return route;
+ }
+
+ public CamelContext getCamelContext() {
+ if (camelContext == null) {
+ camelContext = getRoute().getCamelContext();
+ }
+ return camelContext;
+ }
+
+ public Processor createProcessor(ProcessorType node) throws Exception {
+ return node.createOutputsProcessor(this);
+ }
+
+ public Endpoint<? extends Exchange> resolveEndpoint(String uri) {
+ return route.resolveEndpoint(uri);
+ }
+
+ public Endpoint<? extends Exchange> resolveEndpoint(String uri, String ref) {
+ Endpoint<? extends Exchange> endpoint = null;
+ if (uri != null) {
+ endpoint = resolveEndpoint(uri);
+ if (endpoint == null) {
+ throw new NoSuchEndpointException(uri);
+ }
+ }
+ if (ref != null) {
+ endpoint = lookup(ref, Endpoint.class);
+ if (endpoint == null) {
+ throw new NoSuchEndpointException("ref:" + ref);
+ }
+ }
+ if (endpoint == null) {
+ throw new IllegalArgumentException("Either 'uri' or 'ref' must be specified on: " + this);
+ } else {
+ return endpoint;
+ }
+ }
+
+ public <T> T lookup(String name, Class<T> type) {
+ return getCamelContext().getRegistry().lookup(name, type);
+ }
+
+ public void commit() {
+ // now lets turn all of the event driven consumer processors into a
+ // single route
+ if (!eventDrivenProcessors.isEmpty()) {
+ Processor processor = Pipeline.newInstance(eventDrivenProcessors);
+
+ // lets create the async processor
+ final AsyncProcessor asyncProcessor = AsyncProcessorTypeConverter.convert(processor);
+ Processor unitOfWorkProcessor = new UnitOfWorkProcessor(asyncProcessor);
+
+ // TODO: hz: move all this into the lifecycle strategy! (used by jmx naming strategy)
+ Route edcr = new EventDrivenConsumerRoute(getEndpoint(), unitOfWorkProcessor);
+ edcr.getProperties().put(Route.PARENT_PROPERTY, Integer.toHexString(route.hashCode()));
+ if (route.getGroup() != null) {
+ edcr.getProperties().put(Route.GROUP_PROPERTY, route.getGroup());
+ }
+ routes.add(edcr);
+ }
+ }
+
+ public void addEventDrivenProcessor(Processor processor) {
+ eventDrivenProcessors.add(processor);
+ }
+
+ public void intercept(Interceptor interceptor) {
+/*
+ InterceptorRef block = new InterceptorRef(interceptor);
+ RouteType route = getRoute();
+ List<ProcessorType<?>> list = route.getOutputs();
+ for (ProcessorType<?> processorType : list) {
+ block.addOutput(processorType);
+ }
+ route.clearOutput();
+ route.intercept(block);
+*/
+
+ //getRoute().getInterceptors().add(new InterceptorRef(interceptor));
+ lastInterceptor = interceptor;
+ }
+
+ public Processor createProceedProcessor() {
+ if (lastInterceptor == null) {
+ throw new IllegalArgumentException("Cannot proceed() from outside of an interceptor!");
+ } else {
+ return new ProceedProcessor(lastInterceptor);
+ }
+ }
+
+ /**
+ * This method retrieves the InterceptStrategy instances this route context.
+ *
+ * @return InterceptStrategy
+ */
+ public List<InterceptStrategy> getInterceptStrategies() {
+ return interceptStrategies;
+ }
+
+ /**
+ * This method sets the InterceptStrategy instances on this route context.
+ *
+ * @param interceptStrategies
+ */
+ public void setInterceptStrategies(List<InterceptStrategy> interceptStrategies) {
+ this.interceptStrategies = interceptStrategies;
+ }
+
+ public void addInterceptStrategy(InterceptStrategy interceptStrategy) {
+ getInterceptStrategies().add(interceptStrategy);
+ }
+}
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DelegateLifecycleStrategy.java Wed May 21 22:12:49 2008
@@ -24,6 +24,7 @@
import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.spi.LifecycleStrategy;
+import org.apache.camel.spi.RouteContext;
/**
* A helper class for folks writing delegate listener strategies
@@ -56,4 +57,4 @@
public void onServiceAdd(CamelContext context, Service service) {
delegate.onServiceAdd(context, service);
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java Wed May 21 22:12:49 2008
@@ -26,9 +26,9 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Route;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.RouteType;
+import org.apache.camel.spi.RouteContext;
public class CamelNamingStrategy {
public static final String VALUE_UNKNOWN = "unknown";
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java Wed May 21 22:12:49 2008
@@ -28,12 +28,12 @@
import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.RouteType;
import org.apache.camel.spi.InstrumentationAgent;
import org.apache.camel.spi.LifecycleStrategy;
+import org.apache.camel.spi.RouteContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java Wed May 21 22:12:49 2008
@@ -32,12 +32,12 @@
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.builder.ExpressionClause;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.processor.Aggregator;
import org.apache.camel.processor.aggregate.AggregationCollection;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java Wed May 21 22:12:49 2008
@@ -25,7 +25,7 @@
import org.apache.camel.Processor;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.bean.RegistryBean;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ObjectHelper;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java Wed May 21 22:12:49 2008
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.CatchProcessor;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java Wed May 21 22:12:49 2008
@@ -29,9 +29,9 @@
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionClause;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.ChoiceProcessor;
import org.apache.camel.processor.FilterProcessor;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CollectionStringBuffer;
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CompletedPredicate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CompletedPredicate.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CompletedPredicate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CompletedPredicate.java Wed May 21 22:12:49 2008
@@ -23,8 +23,8 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Predicate;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java Wed May 21 22:12:49 2008
@@ -28,8 +28,8 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.ConvertBodyProcessor;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "convertBodyTo")
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java Wed May 21 22:12:49 2008
@@ -22,9 +22,9 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.processor.Delayer;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
@@ -69,4 +69,4 @@
Expression processAtExpression = getExpression() != null ? getExpression().createExpression(routeContext) : null;
return new Delayer(childProcessor, processAtExpression, delay);
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java Wed May 21 22:12:49 2008
@@ -30,9 +30,9 @@
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.builder.ErrorHandlerBuilder;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.CatchProcessor;
import org.apache.camel.processor.RedeliveryPolicy;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
/**
@@ -203,4 +203,4 @@
}
return answer;
}
-}
\ No newline at end of file
+}
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=659007&r1=659006&r2=659007&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 Wed May 21 22:12:49 2008
@@ -22,14 +22,13 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.processor.FilterProcessor;
+import org.apache.camel.spi.RouteContext;
/**
* A base class for nodes which contain an expression and a number of outputs
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java Wed May 21 22:12:49 2008
@@ -21,9 +21,9 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Predicate;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.processor.FilterProcessor;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java Wed May 21 22:12:49 2008
@@ -21,7 +21,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
@@ -43,4 +43,4 @@
public Processor createProcessor(RouteContext routeContext) throws Exception {
return routeContext.createProcessor(this);
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java Wed May 21 22:12:49 2008
@@ -24,7 +24,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java Wed May 21 22:12:49 2008
@@ -24,9 +24,9 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.idempotent.IdempotentConsumer;
import org.apache.camel.processor.idempotent.MessageIdRepository;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java Wed May 21 22:12:49 2008
@@ -24,8 +24,8 @@
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.builder.PredicateBuilder;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.Interceptor;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
@@ -76,4 +76,4 @@
public ProceedType getProceed() {
return proceed;
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java Wed May 21 22:12:49 2008
@@ -23,8 +23,8 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.DelegateProcessor;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java Wed May 21 22:12:49 2008
@@ -18,8 +18,8 @@
import javax.xml.bind.annotation.XmlType;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.DelegateProcessor;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java Wed May 21 22:12:49 2008
@@ -29,7 +29,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.loadbalancer.LoadBalancerType;
import org.apache.camel.model.loadbalancer.RandomLoadBalanceStrategy;
import org.apache.camel.model.loadbalancer.RoundRobinLoadBalanceStrategy;
@@ -41,6 +40,7 @@
import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
import org.apache.camel.processor.loadbalancer.StickyLoadBalancer;
import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CollectionStringBuffer;
@XmlRootElement(name = "loadBalance")
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java Wed May 21 22:12:49 2008
@@ -24,7 +24,6 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.model.dataformat.DataFormatType;
@@ -34,6 +33,7 @@
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.processor.MarshalProcessor;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.RouteContext;
/**
* Marshals to a binary payload using the given {@link DataFormatType}
@@ -98,4 +98,4 @@
DataFormat dataFormat = DataFormatType.getDataFormat(routeContext, getDataFormatType(), ref);
return new MarshalProcessor(dataFormat);
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java Wed May 21 22:12:49 2008
@@ -26,11 +26,11 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.MulticastProcessor;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
import org.apache.camel.processor.interceptor.StreamCachingInterceptor;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java Wed May 21 22:12:49 2008
@@ -21,7 +21,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
@@ -44,4 +44,4 @@
public String getLabel() {
return "otherwise";
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java Wed May 21 22:12:49 2008
@@ -23,8 +23,8 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.spi.Policy;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java Wed May 21 22:12:49 2008
@@ -21,7 +21,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java Wed May 21 22:12:49 2008
@@ -23,7 +23,7 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
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=659007&r1=659006&r2=659007&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 Wed May 21 22:12:49 2008
@@ -47,7 +47,6 @@
import org.apache.camel.builder.NoErrorHandlerBuilder;
import org.apache.camel.builder.ProcessorBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.dataformat.DataFormatType;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.model.language.LanguageExpression;
@@ -62,6 +61,7 @@
import org.apache.camel.processor.idempotent.MessageIdRepository;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.InterceptStrategy;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.Policy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java Wed May 21 22:12:49 2008
@@ -22,9 +22,9 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.processor.RecipientList;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
@@ -52,4 +52,4 @@
public Processor createProcessor(RouteContext routeContext) throws Exception {
return new RecipientList(getExpression().createExpression(routeContext));
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java Wed May 21 22:12:49 2008
@@ -29,12 +29,12 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.config.BatchResequencerConfig;
import org.apache.camel.model.config.StreamResequencerConfig;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.processor.Resequencer;
import org.apache.camel.processor.StreamResequencer;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
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=659007&r1=659006&r2=659007&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 Wed May 21 22:12:49 2008
@@ -33,9 +33,10 @@
import org.apache.camel.Endpoint;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.Route;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.interceptor.StreamCachingInterceptor;
import org.apache.camel.processor.DelegateProcessor;
+import org.apache.camel.impl.DefaultRouteContext;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelContextHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -199,7 +200,7 @@
// Implementation methods
// -------------------------------------------------------------------------
protected void addRoutes(Collection<Route> routes, FromType fromType) throws Exception {
- RouteContext routeContext = new RouteContext(this, fromType, routes);
+ RouteContext routeContext = new DefaultRouteContext(this, fromType, routes);
routeContext.getEndpoint(); // force endpoint resolution
if (camelContext != null) {
camelContext.getLifecycleStrategy().onRouteContextCreate(routeContext);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java Wed May 21 22:12:49 2008
@@ -25,8 +25,8 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.RoutingSlip;
+import org.apache.camel.spi.RouteContext;
@XmlRootElement(name = "routingSlip")
@XmlAccessorType(XmlAccessType.FIELD)
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java Wed May 21 22:12:49 2008
@@ -24,10 +24,9 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
-import org.apache.camel.processor.Delayer;
import org.apache.camel.processor.SetHeaderProcessor;
+import org.apache.camel.spi.RouteContext;
@XmlRootElement(name = "setHeader")
@XmlAccessorType(XmlAccessType.FIELD)
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java Wed May 21 22:12:49 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
@@ -29,11 +28,11 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.processor.Splitter;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java Wed May 21 22:12:49 2008
@@ -29,9 +29,9 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.Pipeline;
import org.apache.camel.processor.ThreadProcessor;
+import org.apache.camel.spi.RouteContext;
/**
* Represents an XML <thread/> element
@@ -228,4 +228,4 @@
public void setExecutor(ThreadPoolExecutor executor) {
this.executor = executor;
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java Wed May 21 22:12:49 2008
@@ -26,8 +26,8 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.Throttler;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java Wed May 21 22:12:49 2008
@@ -27,8 +27,8 @@
import org.apache.camel.CamelException;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.ThrowFaultProcessor;
+import org.apache.camel.spi.RouteContext;
@XmlRootElement(name = "throwFault")
@XmlAccessorType(XmlAccessType.FIELD)
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java Wed May 21 22:12:49 2008
@@ -27,8 +27,8 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.SendProcessor;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java Wed May 21 22:12:49 2008
@@ -22,8 +22,8 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.TransformProcessor;
+import org.apache.camel.spi.RouteContext;
@XmlRootElement(name = "transform")
@XmlAccessorType(XmlAccessType.FIELD)
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java Wed May 21 22:12:49 2008
@@ -25,9 +25,9 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.CatchProcessor;
import org.apache.camel.processor.TryProcessor;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java Wed May 21 22:12:49 2008
@@ -24,7 +24,6 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.model.dataformat.DataFormatType;
@@ -34,6 +33,7 @@
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.RouteContext;
/**
* Unmarshals the binary payload using the given {@link DataFormatType}
@@ -98,4 +98,4 @@
DataFormat dataFormat = DataFormatType.getDataFormat(routeContext, getDataFormatType(), ref);
return new UnmarshalProcessor(dataFormat);
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java Wed May 21 22:12:49 2008
@@ -19,9 +19,9 @@
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Predicate;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.processor.FilterProcessor;
+import org.apache.camel.spi.RouteContext;
/**
* @version $Revision$
@@ -48,4 +48,4 @@
public FilterProcessor createProcessor(RouteContext routeContext) throws Exception {
return createFilterProcessor(routeContext);
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java Wed May 21 22:12:49 2008
@@ -25,9 +25,9 @@
import javax.xml.bind.annotation.XmlType;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.IdentifiedType;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import static org.apache.camel.util.ObjectHelper.notNull;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java Wed May 21 22:12:49 2008
@@ -18,8 +18,8 @@
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.RouteContext;
/**
* Represents the Java Serialization {@link DataFormat}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java Wed May 21 22:12:49 2008
@@ -21,8 +21,8 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.RouteContext;
/**
* Represents the String (text based) {@link DataFormat}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java Wed May 21 22:12:49 2008
@@ -33,8 +33,9 @@
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.builder.ExpressionClause;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.impl.DefaultRouteContext;
import org.apache.camel.spi.Language;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
@@ -90,7 +91,7 @@
public Object evaluate(Exchange exchange) {
if (expressionValue == null) {
- RouteContext routeContext = new RouteContext(exchange.getContext());
+ RouteContext routeContext = new DefaultRouteContext(exchange.getContext());
expressionValue = createExpression(routeContext);
}
ObjectHelper.notNull(expressionValue, "expressionValue");
@@ -105,7 +106,7 @@
public boolean matches(Exchange exchange) {
if (predicate == null) {
- RouteContext routeContext = new RouteContext(exchange.getContext());
+ RouteContext routeContext = new DefaultRouteContext(exchange.getContext());
predicate = createPredicate(routeContext);
}
ObjectHelper.notNull(predicate, "predicate");
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java Wed May 21 22:12:49 2008
@@ -24,8 +24,8 @@
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.language.bean.BeanExpression;
+import org.apache.camel.spi.RouteContext;
/**
* For expresions and predicates using the
@@ -81,4 +81,4 @@
}
return getExpression();
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java Wed May 21 22:12:49 2008
@@ -24,8 +24,8 @@
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.spi.NamespaceAware;
+import org.apache.camel.spi.RouteContext;
/**
* A useful base class for any expression which may be namespace or XML content aware
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java Wed May 21 22:12:49 2008
@@ -23,7 +23,7 @@
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.spi.RouteContext;
/**
* For XPath expresions and predicates
@@ -70,4 +70,4 @@
setProperty(predicate, "resultType", resultType);
}
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java Wed May 21 22:12:49 2008
@@ -24,8 +24,7 @@
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.impl.RouteContext;
-import org.apache.camel.model.OutputType;
+import org.apache.camel.spi.RouteContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -98,4 +97,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java Wed May 21 22:12:49 2008
@@ -27,9 +27,9 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.IdentifiedType;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import static org.apache.camel.util.ObjectHelper.notNull;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java Wed May 21 22:12:49 2008
@@ -18,8 +18,8 @@
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.RouteContext;
@XmlRootElement(name = "random")
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java Wed May 21 22:12:49 2008
@@ -18,8 +18,8 @@
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.RouteContext;
@XmlRootElement(name = "roundRobin")
public class RoundRobinLoadBalanceStrategy extends LoadBalancerType {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java Wed May 21 22:12:49 2008
@@ -18,8 +18,8 @@
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.spi.RouteContext;
@XmlRootElement(name = "topic")
public class TopicLoadBalanceStrategy extends LoadBalancerType {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/LifecycleStrategy.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/LifecycleStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/LifecycleStrategy.java Wed May 21 22:12:49 2008
@@ -23,7 +23,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.Service;
-import org.apache.camel.impl.RouteContext;
public interface LifecycleStrategy {
/**
Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java?rev=659007&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java Wed May 21 22:12:49 2008
@@ -0,0 +1,96 @@
+/**
+ * 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.spi;
+
+import java.util.List;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Route;
+import org.apache.camel.model.FromType;
+import org.apache.camel.model.ProcessorType;
+import org.apache.camel.model.RouteType;
+import org.apache.camel.processor.Interceptor;
+import org.apache.camel.spi.RouteContext;
+import org.apache.camel.spi.InterceptStrategy;
+
+/**
+ * The context used to activate new routing rules
+ *
+ * @version $Revision$
+ */
+public interface RouteContext {
+
+ Endpoint<? extends Exchange> getEndpoint();
+
+ FromType getFrom();
+
+ RouteType getRoute();
+
+ /**
+ * Gets the CamelContext
+ */
+ CamelContext getCamelContext();
+
+ Processor createProcessor(ProcessorType node) throws Exception;
+
+ /**
+ * Resolves an endpoint from the URI
+ */
+ Endpoint<? extends Exchange> resolveEndpoint(String uri);
+
+ /**
+ * Resolves an endpoint from either a URI or a named reference
+ */
+ Endpoint<? extends Exchange> resolveEndpoint(String uri, String ref);
+
+ /**
+ * lookup an object by name and type
+ */
+ <T> T lookup(String name, Class<T> type);
+
+ /**
+ * Lets complete the route creation, creating a single event driven route
+ * for the current from endpoint with any processors required
+ */
+ public void commit();
+
+ void addEventDrivenProcessor(Processor processor);
+
+ void intercept(Interceptor interceptor);
+
+ Processor createProceedProcessor();
+
+ /**
+ * This method retrieves the InterceptStrategy instances this route context.
+ *
+ * @return InterceptStrategy
+ */
+ List<InterceptStrategy> getInterceptStrategies();
+
+ /**
+ * This method sets the InterceptStrategy instances on this route context.
+ *
+ * @param interceptStrategies
+ */
+ void setInterceptStrategies(List<InterceptStrategy> interceptStrategies);
+
+ void addInterceptStrategy(InterceptStrategy interceptStrategy);
+
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java?rev=659007&r1=659006&r2=659007&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java Wed May 21 22:12:49 2008
@@ -26,10 +26,11 @@
import org.apache.camel.bam.model.ActivityState;
import org.apache.camel.bam.model.ProcessInstance;
import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.impl.RouteContext;
+import org.apache.camel.impl.DefaultRouteContext;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.model.OutputType;
import org.apache.camel.model.RouteType;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.Time;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -92,7 +93,7 @@
ArrayList<Route> list = new ArrayList<Route>();
RouteType route = new RouteType();
route.setCamelContext(first.getBuilder().getProcessBuilder().getContext());
- RouteContext routeContext = new RouteContext(route, null, list);
+ RouteContext routeContext = new DefaultRouteContext(route, null, list);
overdueAction = overdueProcessors.createOutputsProcessor(routeContext);
}