You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2007/03/20 15:22:00 UTC
svn commit: r520404 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/pojo/ camel-core/src...
Author: jstrachan
Date: Tue Mar 20 07:21:58 2007
New Revision: 520404
URL: http://svn.apache.org/viewvc?view=rev&rev=520404
Log:
minor refactor to move the processors into a separate package
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (contents, props changed)
- copied, changed from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContainer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java (contents, props changed)
- copied, changed from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ChoiceProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java (contents, props changed)
- copied, changed from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CompositeProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java (contents, props changed)
- copied, changed from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/FilterProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptorProcessor.java
- copied, changed from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InterceptorProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (contents, props changed)
- copied, changed from r520375, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java (contents, props changed)
- copied, changed from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SendProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/package.html (with props)
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContainer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ChoiceProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CompositeProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/FilterProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InterceptorProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SendProcessor.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RouteFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExchangeSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpointResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpointResolver.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/RouteBuilderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/pojo/PojoRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/queue/QueueRouteTest.java
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/Builder.java
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/DefaultJmsExchange.java
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsComponent.java
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpoint.java
activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpointResolver.java
activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/jms/JmsRouteTest.java
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContainer.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?view=diff&rev=520404&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContainer.java&r1=520373&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContainer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Tue Mar 20 07:21:58 2007
@@ -26,12 +26,12 @@
import org.apache.camel.impl.DefaultExchangeConverter;
/**
- * Represents the container used to configure routes and the policies to use.
+ * Represents the context used to configure routes and the policies to use.
*
* @version $Revision$
* @org.apache.xbean.XBean element="container" rootElement="true"
*/
-public class CamelContainer<E extends Exchange> {
+public class CamelContext<E extends Exchange> {
private EndpointResolver<E> endpointResolver;
private ExchangeConverter exchangeConverter;
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java Tue Mar 20 07:21:58 2007
@@ -26,7 +26,7 @@
/**
* The CamelContainer is injected into the component when it is added to it
*/
- void setContainer(CamelContainer container);
+ void setContainer(CamelContext container);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java Tue Mar 20 07:21:58 2007
@@ -49,10 +49,17 @@
*
* @throws IllegalStateException if the Endpoint has already been activated.
*/
- public void activate(Processor<E> processor) throws IllegalStateException;
+ void activate(Processor<E> processor) throws IllegalStateException;
/**
* Called by the container when the endpoint is deactivated
*/
void deactivate();
+
+ /**
+ * Returns the context which created the endpoint
+ *
+ * @return the context which created the endpoint
+ */
+ CamelContext getContext();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointResolver.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointResolver.java Tue Mar 20 07:21:58 2007
@@ -26,12 +26,12 @@
/**
* Resolves the component for a given uri or returns null if now component handles it.
*/
- public Component resolveComponent(CamelContainer container, String uri);
+ public Component resolveComponent(CamelContext container, String uri);
/**
* Resolves the endpoint for a given uri or returns null if no endpoint could be found
*/
- public Endpoint<E> resolveEndpoint(CamelContainer container, String uri);
+ public Endpoint<E> resolveEndpoint(CamelContext container, String uri);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Tue Mar 20 07:21:58 2007
@@ -95,6 +95,6 @@
*
* @return the container which owns this exchange
*/
- CamelContainer<Exchange> getContainer();
+ CamelContext<Exchange> getContainer();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java Tue Mar 20 07:21:58 2007
@@ -17,6 +17,8 @@
*/
package org.apache.camel;
+import org.apache.camel.processor.RecipientList;
+
/**
* A runtime exception thrown if a routing processor such as a {@link RecipientList} is unable to resolve
* an {@link Endpoint} from a URI.
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RouteFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RouteFactory.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RouteFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RouteFactory.java Tue Mar 20 07:21:58 2007
@@ -20,7 +20,7 @@
/**
* A simple callback that POJOs can implement to be called back by the
- * {@link CamelContainer} with a properly configured {@link RouteBuilder}
+ * {@link CamelContext} with a properly configured {@link RouteBuilder}
* to build routes
*
* @version $Revision: $
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java Tue Mar 20 07:21:58 2007
@@ -16,8 +16,8 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.ChoiceProcessor;
-import org.apache.camel.FilterProcessor;
+import org.apache.camel.processor.ChoiceProcessor;
+import org.apache.camel.processor.FilterProcessor;
import org.apache.camel.Predicate;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java Tue Mar 20 07:21:58 2007
@@ -20,7 +20,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.Exchange;
-import org.apache.camel.SendProcessor;
+import org.apache.camel.processor.SendProcessor;
/**
* @version $Revision$
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java Tue Mar 20 07:21:58 2007
@@ -16,10 +16,10 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.CompositeProcessor;
+import org.apache.camel.processor.CompositeProcessor;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.InterceptorProcessor;
+import org.apache.camel.processor.InterceptorProcessor;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java Tue Mar 20 07:21:58 2007
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.camel.Exchange;
-import org.apache.camel.InterceptorProcessor;
+import org.apache.camel.processor.InterceptorProcessor;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java Tue Mar 20 07:21:58 2007
@@ -16,7 +16,7 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.FilterProcessor;
+import org.apache.camel.processor.FilterProcessor;
import org.apache.camel.Predicate;
import org.apache.camel.Exchange;
import org.apache.camel.Predicates;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java Tue Mar 20 07:21:58 2007
@@ -20,7 +20,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Expression;
-import org.apache.camel.RecipientList;
+import org.apache.camel.processor.RecipientList;
/**
* Creates a dynamic <a href="http://activemq.apache.org/camel/recipient-list.html">Recipient List</a> pattern.
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Tue Mar 20 07:21:58 2007
@@ -16,7 +16,7 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointResolver;
import org.apache.camel.Exchange;
@@ -36,7 +36,7 @@
* @version $Revision$
*/
public abstract class RouteBuilder<E extends Exchange> extends BuilderSupport<E> {
- private CamelContainer<E> container;
+ private CamelContext<E> container;
private List<DestinationBuilder<E>> destinationBuilders = new ArrayList<DestinationBuilder<E>>();
private AtomicBoolean initalized = new AtomicBoolean(false);
private Map<Endpoint<E>, Processor<E>> routeMap = new HashMap<Endpoint<E>, Processor<E>>();
@@ -44,7 +44,7 @@
protected RouteBuilder() {
}
- protected RouteBuilder(CamelContainer<E> container) {
+ protected RouteBuilder(CamelContext<E> container) {
this.container = container;
}
@@ -57,7 +57,7 @@
* Resolves the given URI to an endpoint
*/
public Endpoint<E> endpoint(String uri) {
- CamelContainer<E> c = getContainer();
+ CamelContext<E> c = getContainer();
EndpointResolver<E> er = c.getEndpointResolver();
return er.resolveEndpoint(c, uri);
}
@@ -90,14 +90,14 @@
// Properties
//-----------------------------------------------------------------------
- public CamelContainer<E> getContainer() {
+ public CamelContext<E> getContainer() {
if (container == null) {
container = createContainer();
}
return container;
}
- public void setContainer(CamelContainer<E> container) {
+ public void setContainer(CamelContext<E> container) {
this.container = container;
}
@@ -138,7 +138,7 @@
}
}
- protected CamelContainer<E> createContainer() {
- return new CamelContainer<E>();
+ protected CamelContext<E> createContainer() {
+ return new CamelContext<E>();
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java Tue Mar 20 07:21:58 2007
@@ -16,7 +16,7 @@
*/
package org.apache.camel.impl;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -29,14 +29,14 @@
*/
public abstract class DefaultEndpoint<E> implements Endpoint<E> {
private String endpointUri;
- private CamelContainer container;
+ private CamelContext context;
private Processor<E> inboundProcessor;
protected AtomicBoolean activated = new AtomicBoolean(false);
protected AtomicBoolean deactivated = new AtomicBoolean(false);
- protected DefaultEndpoint(String endpointUri, CamelContainer container) {
+ protected DefaultEndpoint(String endpointUri, CamelContext container) {
this.endpointUri = endpointUri;
- this.container = container;
+ this.context = container;
}
public int hashCode() {
@@ -54,15 +54,15 @@
@Override
public String toString() {
- return "Endpoint[" + endpointUri + "]";
+ return "Endpoint[" + endpointUri + "]";
}
public String getEndpointUri() {
return endpointUri;
}
- public CamelContainer getContainer() {
- return container;
+ public CamelContext getContext() {
+ return context;
}
/**
@@ -73,19 +73,20 @@
if (type.isInstance(exchange)) {
return type.cast(exchange);
}
- return getContainer().getExchangeConverter().convertTo(type, exchange);
+ return getContext().getExchangeConverter().convertTo(type, exchange);
}
-
public void activate(Processor<E> inboundProcessor) {
if (activated.compareAndSet(false, true)) {
deactivated.set(false);
- this.inboundProcessor = inboundProcessor;
+ this.inboundProcessor = inboundProcessor;
doActivate();
- } else {
- throw new IllegalStateException("Endpoint is already active: "+getEndpointUri());
+ }
+ else {
+ throw new IllegalStateException("Endpoint is already active: " + getEndpointUri());
}
}
+
public void deactivate() {
if (deactivated.compareAndSet(false, true)) {
activated.set(false);
@@ -115,5 +116,4 @@
*/
protected void doDeactivate() {
}
-
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointResolver.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointResolver.java Tue Mar 20 07:21:58 2007
@@ -16,7 +16,7 @@
*/
package org.apache.camel.impl;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointResolver;
@@ -37,12 +37,12 @@
public class DefaultEndpointResolver<E> implements EndpointResolver<E> {
static final private FactoryFinder endpointResolverFactory = new FactoryFinder("META-INF/services/org/apache/camel/EndpointResolver/");
- public Endpoint<E> resolveEndpoint(CamelContainer container, String uri) {
+ public Endpoint<E> resolveEndpoint(CamelContext container, String uri) {
EndpointResolver resolver = getDelegate(uri);
return resolver.resolveEndpoint(container, uri);
}
- public Component resolveComponent(CamelContainer container, String uri) {
+ public Component resolveComponent(CamelContext container, String uri) {
EndpointResolver resolver = getDelegate(uri);
return resolver.resolveComponent(container, uri);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java Tue Mar 20 07:21:58 2007
@@ -16,7 +16,7 @@
*/
package org.apache.camel.impl;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import java.util.HashMap;
@@ -30,7 +30,7 @@
public class DefaultExchange<M, R, F> extends ExchangeSupport<M, R, F> {
private Map<String, Object> headers;
- public DefaultExchange(CamelContainer container) {
+ public DefaultExchange(CamelContext container) {
super(container);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExchangeSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExchangeSupport.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExchangeSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExchangeSupport.java Tue Mar 20 07:21:58 2007
@@ -17,7 +17,7 @@
package org.apache.camel.impl;
import org.apache.camel.Exchange;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
/**
* A base class useful for implementing other typesafe exchanges
@@ -30,9 +30,9 @@
private F fault;
private Exception exception;
private String exchangeId;
- protected final CamelContainer container;
+ protected final CamelContext container;
- public ExchangeSupport(CamelContainer container) {
+ public ExchangeSupport(CamelContext container) {
this.container = container;
}
@@ -78,7 +78,7 @@
this.exchangeId=id;
}
- public CamelContainer getContainer() {
+ public CamelContext getContainer() {
return container;
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoComponent.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoComponent.java Tue Mar 20 07:21:58 2007
@@ -18,7 +18,7 @@
import java.util.HashMap;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
/**
@@ -32,7 +32,7 @@
private final HashMap<String, Object> registry = new HashMap<String, Object>();
private final HashMap<String, PojoEndpoint> activatedEndpoints = new HashMap<String, PojoEndpoint>();
- private CamelContainer container;
+ private CamelContext container;
public void registerPojo(String uri, Object pojo) {
registry.put(uri, pojo);
@@ -52,10 +52,10 @@
}
- public void setContainer(CamelContainer container) {
+ public void setContainer(CamelContext container) {
this.container = container;
}
- public CamelContainer getContainer() {
+ public CamelContext getContainer() {
return container;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpoint.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpoint.java Tue Mar 20 07:21:58 2007
@@ -21,7 +21,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultEndpoint;
/**
@@ -35,7 +35,7 @@
private final Object pojo;
private final PojoComponent component;
- public PojoEndpoint(String uri, CamelContainer container, PojoComponent component, Object pojo) {
+ public PojoEndpoint(String uri, CamelContext container, PojoComponent component, Object pojo) {
super(uri, container);
this.component = component;
this.pojo = pojo;
@@ -59,7 +59,7 @@
}
public PojoExchange createExchange() {
- return new PojoExchange(getContainer());
+ return new PojoExchange(getContext());
}
@Override
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpointResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpointResolver.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpointResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoEndpointResolver.java Tue Mar 20 07:21:58 2007
@@ -16,7 +16,7 @@
*/
package org.apache.camel.pojo;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.EndpointResolver;
import org.apache.camel.util.ObjectHelper;
@@ -37,9 +37,9 @@
* Finds the {@see QueueComponent} specified by the uri. If the {@see QueueComponent}
* object do not exist, it will be created.
*
- * @see org.apache.camel.EndpointResolver#resolveComponent(org.apache.camel.CamelContainer, java.lang.String)
+ * @see org.apache.camel.EndpointResolver#resolveComponent(org.apache.camel.CamelContext, java.lang.String)
*/
- public Component resolveComponent(CamelContainer container, String uri) {
+ public Component resolveComponent(CamelContext container, String uri) {
String id[] = getEndpointId(uri);
return resolveQueueComponent(container, id[0]);
}
@@ -48,16 +48,16 @@
* Finds the {@see QueueEndpoint} specified by the uri. If the {@see QueueEndpoint} or it's associated
* {@see QueueComponent} object do not exist, they will be created.
*
- * @see org.apache.camel.EndpointResolver#resolveEndpoint(org.apache.camel.CamelContainer, java.lang.String)
+ * @see org.apache.camel.EndpointResolver#resolveEndpoint(org.apache.camel.CamelContext, java.lang.String)
*/
- public PojoEndpoint resolveEndpoint(CamelContainer container, String uri) {
+ public PojoEndpoint resolveEndpoint(CamelContext container, String uri) {
String id[] = getEndpointId(uri);
PojoComponent component = resolveQueueComponent(container, id[0]);
Object pojo = component.lookupRegisteredPojo(id[1]);
return new PojoEndpoint(uri, container, component, pojo);
}
- private PojoComponent resolveQueueComponent(CamelContainer container, String componentName) {
+ private PojoComponent resolveQueueComponent(CamelContext container, String componentName) {
Component rc = container.getComponent(componentName);
if( rc == null ) {
throw new IllegalArgumentException("Invalid URI, pojo component does not exist: "+componentName);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoExchange.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoExchange.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/pojo/PojoExchange.java Tue Mar 20 07:21:58 2007
@@ -16,19 +16,15 @@
*/
package org.apache.camel.pojo;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.impl.ExchangeSupport;
import org.apache.camel.impl.DefaultExchange;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
/**
* @version $Revision: 519901 $
*/
public class PojoExchange extends DefaultExchange<PojoInvocation, Object, Throwable> {
- public PojoExchange(CamelContainer container) {
+ public PojoExchange(CamelContext container) {
super(container);
}
}
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java (from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ChoiceProcessor.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java?view=diff&rev=520404&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ChoiceProcessor.java&r1=520373&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ChoiceProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java Tue Mar 20 07:21:58 2007
@@ -15,7 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.processor;
+
+import org.apache.camel.Processor;
+import org.apache.camel.Predicate;
import java.util.ArrayList;
import java.util.List;
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java (from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CompositeProcessor.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java?view=diff&rev=520404&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CompositeProcessor.java&r1=520373&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CompositeProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java Tue Mar 20 07:21:58 2007
@@ -15,7 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.processor;
+
+import org.apache.camel.Processor;
import java.util.Collection;
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java (from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/FilterProcessor.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java?view=diff&rev=520404&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/FilterProcessor.java&r1=520373&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/FilterProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java Tue Mar 20 07:21:58 2007
@@ -15,7 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.processor;
+
+import org.apache.camel.Processor;
+import org.apache.camel.Predicate;
/**
* @version $Revision$
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptorProcessor.java (from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InterceptorProcessor.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptorProcessor.java?view=diff&rev=520404&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InterceptorProcessor.java&r1=520373&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptorProcessor.java&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InterceptorProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptorProcessor.java Tue Mar 20 07:21:58 2007
@@ -15,7 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.processor;
+
+import org.apache.camel.Processor;
/**
* @version $Revision: 519941 $
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (from r520375, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?view=diff&rev=520404&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java&r1=520375&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Tue Mar 20 07:21:58 2007
@@ -15,10 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.processor;
import org.apache.camel.util.ObjectHelper;
import static org.apache.camel.util.ObjectHelper.notNull;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Expression;
+import org.apache.camel.Endpoint;
+import org.apache.camel.NoSuchEndpointException;
import java.util.Iterator;
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java (from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SendProcessor.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java?view=diff&rev=520404&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SendProcessor.java&r1=520373&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/SendProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java Tue Mar 20 07:21:58 2007
@@ -15,7 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.processor;
+
+import org.apache.camel.Processor;
+import org.apache.camel.Endpoint;
/**
* @version $Revision$
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/package.html
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/package.html?view=auto&rev=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/package.html (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/package.html Tue Mar 20 07:21:58 2007
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+<html>
+<head>
+</head>
+<body>
+
+A collection of <a href="http://activemq.apache.org/camel/maven/camel-core/apidocs/org/apache/camel/Processor.html">Processor</a>
+implementations which are used to implement the
+<a href="http://activemq.apache.org/camel/enterprise-integration-patterns.html">Enterprise Integration Patterns</a>
+
+</body>
+</html>
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/package.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueComponent.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueComponent.java Tue Mar 20 07:21:58 2007
@@ -20,7 +20,7 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
/**
@@ -33,9 +33,9 @@
public class QueueComponent<E> implements Component<E> {
private HashMap<String, BlockingQueue<E>> registry = new HashMap<String, BlockingQueue<E>>();
- private CamelContainer container;
+ private CamelContext container;
- public void setContainer(CamelContainer container) {
+ public void setContainer(CamelContext container) {
this.container = container;
}
@@ -52,7 +52,7 @@
return new LinkedBlockingQueue<E>();
}
- public CamelContainer getContainer() {
+ public CamelContext getContainer() {
return container;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpoint.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpoint.java Tue Mar 20 07:21:58 2007
@@ -21,7 +21,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultEndpoint;
@@ -38,7 +38,7 @@
private BlockingQueue<E> queue;
private org.apache.camel.queue.QueueEndpoint.Activation activation;
- public QueueEndpoint(String uri, CamelContainer container, BlockingQueue<E> queue) {
+ public QueueEndpoint(String uri, CamelContext container, BlockingQueue<E> queue) {
super(uri, container);
this.queue = queue;
}
@@ -55,7 +55,7 @@
public E createExchange() {
// How can we create a specific Exchange if we are generic??
// perhaps it would be better if we did not implement this.
- return (E) new DefaultExchange(getContainer());
+ return (E) new DefaultExchange(getContext());
}
public Queue<E> getQueue() {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpointResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpointResolver.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpointResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/queue/QueueEndpointResolver.java Tue Mar 20 07:21:58 2007
@@ -19,7 +19,7 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointResolver;
@@ -46,9 +46,9 @@
* Finds the {@see QueueComponent} specified by the uri. If the {@see QueueComponent}
* object do not exist, it will be created.
*
- * @see org.apache.camel.EndpointResolver#resolveComponent(org.apache.camel.CamelContainer, java.lang.String)
+ * @see org.apache.camel.EndpointResolver#resolveComponent(org.apache.camel.CamelContext, java.lang.String)
*/
- public Component resolveComponent(CamelContainer container, String uri) {
+ public Component resolveComponent(CamelContext container, String uri) {
String id[] = getEndpointId(uri);
return resolveQueueComponent(container, id[0]);
}
@@ -57,9 +57,9 @@
* Finds the {@see QueueEndpoint} specified by the uri. If the {@see QueueEndpoint} or it's associated
* {@see QueueComponent} object do not exist, they will be created.
*
- * @see org.apache.camel.EndpointResolver#resolveEndpoint(org.apache.camel.CamelContainer, java.lang.String)
+ * @see org.apache.camel.EndpointResolver#resolveEndpoint(org.apache.camel.CamelContext, java.lang.String)
*/
- public Endpoint<E> resolveEndpoint(CamelContainer container, String uri) {
+ public Endpoint<E> resolveEndpoint(CamelContext container, String uri) {
String id[] = getEndpointId(uri);
QueueComponent<E> component = resolveQueueComponent(container, id[0]);
BlockingQueue<E> queue = component.getOrCreateQueue(id[1]);
@@ -82,7 +82,7 @@
}
@SuppressWarnings("unchecked")
- private QueueComponent<E> resolveQueueComponent(CamelContainer container, String componentName) {
+ private QueueComponent<E> resolveQueueComponent(CamelContext container, String componentName) {
Component rc = container.getOrCreateComponent(componentName, new Callable<Component<E>>(){
public Component<E> call() throws Exception {
return new QueueComponent<E>();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/RouteBuilderTest.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/RouteBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/RouteBuilderTest.java Tue Mar 20 07:21:58 2007
@@ -18,6 +18,12 @@
import junit.framework.TestCase;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.processor.ChoiceProcessor;
+import org.apache.camel.processor.CompositeProcessor;
+import org.apache.camel.processor.SendProcessor;
+import org.apache.camel.processor.FilterProcessor;
+import org.apache.camel.processor.InterceptorProcessor;
+import org.apache.camel.processor.RecipientList;
import java.util.ArrayList;
import java.util.List;
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/pojo/PojoRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/pojo/PojoRouteTest.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/pojo/PojoRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/pojo/PojoRouteTest.java Tue Mar 20 07:21:58 2007
@@ -21,10 +21,9 @@
import junit.framework.TestCase;
-import org.apache.camel.CamelContainer;
-import org.apache.camel.InterceptorProcessor;
+import org.apache.camel.CamelContext;
+import org.apache.camel.processor.InterceptorProcessor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultExchange;
/**
* @version $Revision: 520220 $
@@ -33,7 +32,7 @@
public void testJmsRoute() throws Exception {
- CamelContainer container = new CamelContainer();
+ CamelContext container = new CamelContext();
PojoComponent component = new PojoComponent();
component.registerPojo("hello", new SayService("Hello!"));
component.registerPojo("bye", new SayService("Good Bye!"));
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/queue/QueueRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/queue/QueueRouteTest.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/queue/QueueRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/queue/QueueRouteTest.java Tue Mar 20 07:21:58 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -34,7 +34,7 @@
public class QueueRouteTest extends TestCase {
static class StringExchange extends DefaultExchange<String, String, String> {
- public StringExchange(CamelContainer container) {
+ public StringExchange(CamelContext container) {
super(container);
}
}
@@ -42,7 +42,7 @@
public void testJmsRoute() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
- CamelContainer container = new CamelContainer();
+ CamelContext container = new CamelContext();
// lets add some routes
container.routes(new RouteBuilder() {
Modified: activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/Builder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/Builder.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/Builder.java (original)
+++ activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/Builder.java Tue Mar 20 07:21:58 2007
@@ -17,7 +17,7 @@
package org.apache.camel.jms;
/**
- * Some helper builder methods for the easy configuration of the {@link org.apache.camel.CamelContainer} via Java code.
+ * Some helper builder methods for the easy configuration of the {@link org.apache.camel.CamelContext} via Java code.
*
* @version $Revision: $
*/
Modified: activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/DefaultJmsExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/DefaultJmsExchange.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/DefaultJmsExchange.java (original)
+++ activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/DefaultJmsExchange.java Tue Mar 20 07:21:58 2007
@@ -16,7 +16,7 @@
*/
package org.apache.camel.jms;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.InvalidHeaderTypeException;
import org.apache.camel.impl.ExchangeSupport;
@@ -33,11 +33,11 @@
public class DefaultJmsExchange extends ExchangeSupport<Message, Message, Message> implements JmsExchange {
private Map<String, Object> lazyHeaders;
- public DefaultJmsExchange(CamelContainer container) {
+ public DefaultJmsExchange(CamelContext container) {
super(container);
}
- public DefaultJmsExchange(CamelContainer container, Message message) {
+ public DefaultJmsExchange(CamelContext container, Message message) {
super(container);
setRequest(message);
}
Modified: activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsComponent.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsComponent.java (original)
+++ activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsComponent.java Tue Mar 20 07:21:58 2007
@@ -18,7 +18,7 @@
package org.apache.camel.jms;
import com.sun.jndi.toolkit.url.Uri;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Processor;
import org.apache.camel.util.ObjectHelper;
@@ -36,7 +36,7 @@
public static final String QUEUE_PREFIX = "queue/";
public static final String TOPIC_PREFIX = "topic/";
- private CamelContainer container;
+ private CamelContext container;
private JmsTemplate template;
/**
@@ -79,7 +79,7 @@
this.template = template;
}
- public JmsComponent(CamelContainer container) {
+ public JmsComponent(CamelContext container) {
this();
this.container = container;
}
@@ -136,11 +136,11 @@
}
- public CamelContainer getContainer() {
+ public CamelContext getContainer() {
return container;
}
- public void setContainer(CamelContainer container) {
+ public void setContainer(CamelContext container) {
this.container = container;
}
Modified: activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpoint.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpoint.java (original)
+++ activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpoint.java Tue Mar 20 07:21:58 2007
@@ -16,9 +16,8 @@
*/
package org.apache.camel.jms;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,7 +40,7 @@
private AbstractMessageListenerContainer listenerContainer;
private String destination;
- public JmsEndpoint(String endpointUri, CamelContainer container, String destination, JmsOperations template, AbstractMessageListenerContainer listenerContainer) {
+ public JmsEndpoint(String endpointUri, CamelContext container, String destination, JmsOperations template, AbstractMessageListenerContainer listenerContainer) {
super(endpointUri, container);
this.destination = destination;
this.template = template;
@@ -81,12 +80,12 @@
}
public JmsExchange createExchange() {
- return new DefaultJmsExchange(getContainer());
+ return new DefaultJmsExchange(getContext());
}
public JmsExchange createExchange(Message message) {
- return new DefaultJmsExchange(getContainer(), message);
+ return new DefaultJmsExchange(getContext(), message);
}
Modified: activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpointResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpointResolver.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpointResolver.java (original)
+++ activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/jms/JmsEndpointResolver.java Tue Mar 20 07:21:58 2007
@@ -18,7 +18,7 @@
package org.apache.camel.jms;
import org.apache.axis.transport.jms.JMSEndpoint;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.EndpointResolver;
import org.apache.camel.queue.QueueComponent;
@@ -46,7 +46,7 @@
* Finds the {@see JmsComponent} specified by the uri. If the {@see JmsComponent}
* object do not exist, it will be created.
*/
- public Component resolveComponent(CamelContainer container, String uri) {
+ public Component resolveComponent(CamelContext container, String uri) {
String id[] = getEndpointId(uri);
return resolveJmsComponent(container, id[0]);
}
@@ -55,7 +55,7 @@
* Finds the {@see QueueEndpoint} specified by the uri. If the {@see QueueEndpoint} or it's associated
* {@see QueueComponent} object do not exist, they will be created.
*/
- public JmsEndpoint resolveEndpoint(CamelContainer container, String uri) {
+ public JmsEndpoint resolveEndpoint(CamelContext container, String uri) {
String id[] = getEndpointId(uri);
JmsComponent component = resolveJmsComponent(container, id[0]);
return component.createEndpoint(uri, id[1]);
@@ -77,7 +77,7 @@
}
@SuppressWarnings("unchecked")
- private JmsComponent resolveJmsComponent(final CamelContainer container, final String componentName) {
+ private JmsComponent resolveJmsComponent(final CamelContext container, final String componentName) {
Component rc = container.getOrCreateComponent(componentName, new Callable<JmsComponent>(){
public JmsComponent call() throws Exception {
return new JmsComponent(container);
Modified: activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/jms/JmsRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/jms/JmsRouteTest.java?view=diff&rev=520404&r1=520403&r2=520404
==============================================================================
--- activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/jms/JmsRouteTest.java (original)
+++ activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/jms/JmsRouteTest.java Tue Mar 20 07:21:58 2007
@@ -19,7 +19,7 @@
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.CamelContainer;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -36,7 +36,7 @@
public void testJmsRoute() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
- CamelContainer container = new CamelContainer();
+ CamelContext container = new CamelContext();
// lets configure some componnets
ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");