activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r525547 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/component/pojo/ camel-core/src/main/java/org/apache/camel/component/pojo/timer/ camel-core/src/main/java/org/apache/cam...
Date Wed, 04 Apr 2007 16:05:42 GMT
Author: jstrachan
Date: Wed Apr  4 09:05:38 2007
New Revision: 525547

URL: http://svn.apache.org/viewvc?view=rev&rev=525547
Log:
minor refactor of Processor.onExchange() -> Processor.process() which matches the interface name a bit better (and is less exchange-y)

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoConsumer.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/timer/TimerConsumer.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpointConsumer.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptorProcessor.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/pojo/PojoRouteTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
    activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
    activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
    activemq/camel/trunk/camel-itest/src/main/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
    activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java
    activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java
    activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java
    activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java
    activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java
    activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
    activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
    activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java
    activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
    activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
    activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
    activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
    activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
    activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
    activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
    activemq/camel/trunk/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java
    activemq/camel/trunk/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
    activemq/camel/trunk/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java
    activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
    activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
    activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
    activemq/camel/trunk/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Processor.java Wed Apr  4 09:05:38 2007
@@ -27,5 +27,5 @@
     /**
      * Processes the message exchange
      */
-    void onExchange(E exchange);
+    void process(E exchange);
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoConsumer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoConsumer.java Wed Apr  4 09:05:38 2007
@@ -92,7 +92,7 @@
         PojoInvocation invocation = new PojoInvocation(proxy, method, args);
         PojoExchange exchange = getEndpoint().createExchange();
         exchange.setInvocation(invocation);
-        getProcessor().onExchange(exchange);
+        getProcessor().process(exchange);
         Throwable fault = exchange.getException();
         if (fault != null) {
             throw new InvocationTargetException(fault);

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java Wed Apr  4 09:05:38 2007
@@ -47,7 +47,7 @@
         	throw new NoSuchEndpointException(getEndpointUri());
         
         return startService(new DefaultProducer<PojoExchange>(this) {
-            public void onExchange(PojoExchange exchange) {
+            public void process(PojoExchange exchange) {
                 invoke(pojo, exchange);
             }
         });

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/timer/TimerConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/timer/TimerConsumer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/timer/TimerConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/timer/TimerConsumer.java Wed Apr  4 09:05:38 2007
@@ -107,7 +107,7 @@
         PojoInvocation invocation = new PojoInvocation(proxy, method, args);
         PojoExchange exchange = getEndpoint().createExchange();
         exchange.setInvocation(invocation);
-        getProcessor().onExchange(exchange);
+        getProcessor().process(exchange);
         Throwable fault = exchange.getException();
         if (fault != null) {
             throw new InvocationTargetException(fault);

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java Wed Apr  4 09:05:38 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.queue;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.Consumer;
@@ -44,7 +43,7 @@
 
     public Producer<E> createProducer() throws Exception {
         return startService(new DefaultProducer<E>(this) {
-            public void onExchange(E exchange) {
+            public void process(E exchange) {
                 queue.add(exchange);
             }
         });

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpointConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpointConsumer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpointConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpointConsumer.java Wed Apr  4 09:05:38 2007
@@ -53,7 +53,7 @@
             }
             if (exchange != null) {
                 try {
-                    processor.onExchange(exchange);
+                    processor.process(exchange);
                 }
                 catch (Throwable e) {
                     e.printStackTrace();

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/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=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java Wed Apr  4 09:05:38 2007
@@ -38,16 +38,16 @@
         this.otherwise = otherwise;
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         for (FilterProcessor<E> filterProcessor : filters) {
             Predicate<E> predicate = filterProcessor.getPredicate();
             if (predicate != null) {
-                filterProcessor.getProcessor().onExchange(exchange);
+                filterProcessor.getProcessor().process(exchange);
                 return;
             }
         }
         if (otherwise != null) {
-            otherwise.onExchange(exchange);
+            otherwise.process(exchange);
         }
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/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=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CompositeProcessor.java Wed Apr  4 09:05:38 2007
@@ -35,9 +35,9 @@
         this.processors = processors;
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         for (Processor<E> processor : processors) {
-            processor.onExchange(exchange);
+            processor.process(exchange);
         }
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java Wed Apr  4 09:05:38 2007
@@ -54,7 +54,7 @@
         return "DeadLetterChannel[" + output + ", " + deadLetter + ", " + redeliveryPolicy + "]";
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         int redeliveryCounter = 0;
         long redeliveryDelay = 0;
 
@@ -67,7 +67,7 @@
             }
 
             try {
-                output.onExchange(exchange);
+                output.process(exchange);
                 return;
             }
             catch (RuntimeException e) {
@@ -77,7 +77,7 @@
         while (redeliveryPolicy.shouldRedeliver(redeliveryCounter));
 
         // now lets send to the dead letter queue
-        deadLetter.onExchange(exchange);
+        deadLetter.process(exchange);
     }
 
     // Properties

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/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=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java Wed Apr  4 09:05:38 2007
@@ -34,9 +34,9 @@
         this.processor = processor;
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         if (predicate.matches(exchange)) {
-            processor.onExchange(exchange);
+            processor.process(exchange);
         }
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/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=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptorProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptorProcessor.java Wed Apr  4 09:05:38 2007
@@ -30,9 +30,9 @@
     public InterceptorProcessor() {
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         if (next != null) {
-            next.onExchange(exchange);
+            next.process(exchange);
         }
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java Wed Apr  4 09:05:38 2007
@@ -50,7 +50,7 @@
         return "Logger[" + log + "]";
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         switch (level) {
             case DEBUG:
                 if (log.isDebugEnabled()) {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java Wed Apr  4 09:05:38 2007
@@ -49,9 +49,9 @@
         return "LoggingErrorHandler[" + output + "]";
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         try {
-            output.onExchange(exchange);
+            output.process(exchange);
         }
         catch (RuntimeException e) {
             logError(exchange, e);

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Wed Apr  4 09:05:38 2007
@@ -55,10 +55,10 @@
         return "Multicast" + getEndpoints();
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         for (Producer<E> producer : producers) {
             E copy = copyExchangeStrategy(producer, exchange);
-            producer.onExchange(copy);
+            producer.process(copy);
         }
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java Wed Apr  4 09:05:38 2007
@@ -35,7 +35,7 @@
         super(endpoints);
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         E nextExchange = exchange;
         boolean first = true;
         for (Producer<E> producer : getProducers()) {
@@ -45,7 +45,7 @@
             else {
                 nextExchange = createNextExchange(producer, nextExchange);
             }
-            producer.onExchange(nextExchange);
+            producer.process(nextExchange);
         }
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/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=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Wed Apr  4 09:05:38 2007
@@ -49,13 +49,13 @@
         return "RecipientList[" + expression + "]";
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         Object receipientList = expression.evaluate(exchange);
         Iterator iter = ObjectConverter.iterator(receipientList);
         while (iter.hasNext()) {
             Object recipient = iter.next();
             Endpoint<E> endpoint = resolveEndpoint(exchange, recipient);
-            producerCache.getProducer(endpoint).onExchange(exchange);
+            producerCache.getProducer(endpoint).process(exchange);
         }
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/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=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java Wed Apr  4 09:05:38 2007
@@ -50,11 +50,11 @@
         this.producer = destination.createProducer();
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         if (producer == null) {
             throw new IllegalStateException("No producer, this processor has not been started!");
         }
-        producer.onExchange(exchange);
+        producer.process(exchange);
     }
 
     public Endpoint<E> getDestination() {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java Wed Apr  4 09:05:38 2007
@@ -49,14 +49,14 @@
         return "Splitter[on: " + expression + " to: " + processor + "]";
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         Object value = expression.evaluate(exchange);
         Iterator iter = ObjectConverter.iterator(value);
         while (iter.hasNext()) {
             Object part = iter.next();
             E newExchange = (E) exchange.copy();
             newExchange.getIn().setBody(part);
-            processor.onExchange(newExchange);
+            processor.process(newExchange);
         }
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java Wed Apr  4 09:05:38 2007
@@ -25,7 +25,6 @@
 import org.apache.camel.impl.ServiceSupport;
 
 import java.util.Map;
-import java.util.Collection;
 import java.util.HashMap;
 
 /**
@@ -59,7 +58,7 @@
      */
     public void send(Endpoint<E> endpoint, E exchange) {
         Producer<E> producer = getProducer(endpoint);
-        producer.onExchange(exchange);
+        producer.process(exchange);
     }
 
     /**
@@ -73,10 +72,10 @@
         E exchange = producer.createExchange();
 
         // lets populate using the processor callback
-        processor.onExchange(exchange);
+        processor.process(exchange);
 
         // now lets dispatch
-        producer.onExchange(exchange);
+        producer.process(exchange);
         return exchange;
     }
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java Wed Apr  4 09:05:38 2007
@@ -7,9 +7,9 @@
 import org.apache.camel.processor.InterceptorProcessor;
 
 public class MyInterceptorProcessor extends InterceptorProcessor<Exchange> {
-	public void onExchange(Exchange exchange) {
+	public void process(Exchange exchange) {
 		System.out.println("START of onExchange: "+exchange);
-		next.onExchange(exchange);
+		next.process(exchange);
 		System.out.println("END of onExchange: "+exchange);
 	}
 }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java Wed Apr  4 09:05:38 2007
@@ -20,7 +20,7 @@
 import org.apache.camel.Processor;
 
 public class MyProcessor implements Processor<Exchange> {
-    public void onExchange(Exchange exchange) {
+    public void process(Exchange exchange) {
         System.out.println("Called with exchange: " + exchange);
     }
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java Wed Apr  4 09:05:38 2007
@@ -141,7 +141,7 @@
     protected RouteBuilder<Exchange> buildCustomProcessor() {
 		// START SNIPPET: e4
         myProcessor = new Processor<Exchange>() {
-            public void onExchange(Exchange exchange) {
+            public void process(Exchange exchange) {
                 System.out.println("Called with exchange: " + exchange);
             }
         };

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/pojo/PojoRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/pojo/PojoRouteTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/pojo/PojoRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/pojo/PojoRouteTest.java Wed Apr  4 09:05:38 2007
@@ -42,8 +42,8 @@
         final AtomicInteger hitCount = new AtomicInteger();
         final InterceptorProcessor<PojoExchange> tracingInterceptor = new InterceptorProcessor<PojoExchange>() {
         	@Override
-        	public void onExchange(PojoExchange exchange) {
-        		super.onExchange(exchange);
+        	public void process(PojoExchange exchange) {
+        		super.process(exchange);
         		hitCount.incrementAndGet();
         	}
         };

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java Wed Apr  4 09:05:38 2007
@@ -45,7 +45,7 @@
             public void configure() {
                 from("queue:test.a").to("queue:test.b");
                 from("queue:test.b").process(new Processor<Exchange>() {
-                    public void onExchange(Exchange e) {
+                    public void process(Exchange e) {
                         System.out.println("Received exchange: " + e.getIn());
                         latch.countDown();
                     }
@@ -62,7 +62,7 @@
         exchange.getIn().setHeader("cheese", 123);
 
         Producer<Exchange> producer = endpoint.createProducer();
-        producer.onExchange(exchange);
+        producer.process(exchange);
 
         // now lets sleep for a while
         boolean received = latch.await(5, TimeUnit.SECONDS);

Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Wed Apr  4 09:05:38 2007
@@ -62,6 +62,6 @@
 
     protected void incomingCxfMessage(Message message) {
         CxfExchange exchange = endpoint.createExchange(message);
-        getProcessor().onExchange(exchange);
+        getProcessor().process(exchange);
     }
 }

Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Wed Apr  4 09:05:38 2007
@@ -50,7 +50,7 @@
         this.transportFactory = transportFactory;
     }
 
-    public void onExchange(CxfExchange exchange) {
+    public void process(CxfExchange exchange) {
         try {
             CxfBinding binding = endpoint.getBinding();
             MessageImpl m = binding.createCxfMessage(exchange);

Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Wed Apr  4 09:05:38 2007
@@ -143,7 +143,7 @@
 
         private void commitOutputMessage() {
             base.client.send(targetCamelEndpointUri, new Processor<org.apache.camel.Exchange>() {
-                public void onExchange(org.apache.camel.Exchange reply) {
+                public void process(org.apache.camel.Exchange reply) {
                     Object request = null;
 
                     if (isTextPayload()) {

Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Wed Apr  4 09:05:38 2007
@@ -136,7 +136,7 @@
     }
 
     protected class ConsumerProcessor implements Processor<Exchange> {
-        public void onExchange(Exchange exchange) {
+        public void process(Exchange exchange) {
             try {
                 incoming(exchange);
             }
@@ -201,7 +201,7 @@
             final String replyToUri = getReplyToDestination(inMessage);
 
             base.client.send(replyToUri, new Processor<Exchange>() {
-                public void onExchange(Exchange reply) {
+                public void process(Exchange reply) {
                     base.marshal(currentStream.toString(), replyToUri, reply);
 
                     setReplyCorrelationID(inMessage, reply);

Modified: activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java (original)
+++ activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java Wed Apr  4 09:05:38 2007
@@ -70,7 +70,7 @@
 
         // now lets invoke it via Camel
         CxfExchange exchange = (CxfExchange) client.send("cxf:http://localhost/test", new Processor<Exchange>() {
-            public void onExchange(Exchange exchange) {
+            public void process(Exchange exchange) {
                 exchange.getIn().setHeader("requestHeader", "foo");
                 exchange.getIn().setBody("<hello>world</hello>");
             }

Modified: activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java (original)
+++ activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java Wed Apr  4 09:05:38 2007
@@ -21,7 +21,6 @@
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.impl.DefaultConsumer;
 import org.apache.camel.Processor;
-import org.apache.camel.CamelContext;
 import org.apache.camel.Producer;
 import org.apache.camel.Consumer;
 
@@ -43,7 +42,7 @@
 
     public Producer<HttpExchange> createProducer() throws Exception {
         return startService(new DefaultProducer<HttpExchange>(this) {
-            public void onExchange(HttpExchange exchange) {
+            public void process(HttpExchange exchange) {
                 /** TODO */
             }
         });

Modified: activemq/camel/trunk/camel-itest/src/main/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-itest/src/main/java/org/apache/camel/itest/jms/JmsIntegrationTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-itest/src/main/java/org/apache/camel/itest/jms/JmsIntegrationTest.java (original)
+++ activemq/camel/trunk/camel-itest/src/main/java/org/apache/camel/itest/jms/JmsIntegrationTest.java Wed Apr  4 09:05:38 2007
@@ -27,7 +27,6 @@
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
 import org.apache.camel.Producer;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.jms.JmsEndpoint;
@@ -35,8 +34,6 @@
 import org.apache.camel.component.jms.JmsMessage;
 import org.apache.camel.component.pojo.PojoComponent;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.ProducerCache;
-
 import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
 import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
 
@@ -87,7 +84,7 @@
         JmsMessage in = exchange.getIn();
         in.setBody("Hello");
         in.setHeader("cheese", 123);
-        producer.onExchange(exchange);
+        producer.process(exchange);
         
         // The Activated endpoint should send it to the pojo due to the configured route.
         assertTrue("The message ware received by the Pojo", receivedCountDown.await(5, TimeUnit.SECONDS));

Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java Wed Apr  4 09:05:38 2007
@@ -15,7 +15,6 @@
 import org.apache.camel.Endpoint;
 import org.apache.camel.Processor;
 import org.apache.camel.Exchange;
-import org.apache.camel.util.ProducerCache;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.common.ServiceUnit;
@@ -53,7 +52,7 @@
             log.debug("Received exchange: " + exchange);
         }
         JbiExchange camelExchange = new JbiExchange(camelEndpoint.getContext(), binding, exchange);
-        processor.onExchange(camelExchange);
+        processor.process(camelExchange);
     }
 
     protected void processInOut(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out) throws Exception {

Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java Wed Apr  4 09:05:38 2007
@@ -40,6 +40,6 @@
 
     public void onMessageExchange(MessageExchange messageExchange) throws MessagingException {
         JbiExchange exchange = new JbiExchange(context, binding, messageExchange);
-        processor.onExchange(exchange);
+        processor.process(exchange);
     }
 }

Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java Wed Apr  4 09:05:38 2007
@@ -43,8 +43,8 @@
 
     public Producer<Exchange> createProducer() throws Exception {
         return startService(new DefaultProducer<Exchange>(this) {
-            public void onExchange(Exchange exchange) {
-                toJbiProcessor.onExchange(exchange);
+            public void process(Exchange exchange) {
+                toJbiProcessor.process(exchange);
             }
         });
     }

Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java Wed Apr  4 09:05:38 2007
@@ -43,7 +43,7 @@
         this.destinationUri = destinationUri;
     }
 
-    public void onExchange(Exchange exchange) {
+    public void process(Exchange exchange) {
         try {
             DeliveryChannel deliveryChannel = componentContext.getDeliveryChannel();
             MessageExchangeFactory exchangeFactory = deliveryChannel.createExchangeFactory();

Modified: activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java (original)
+++ activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java Wed Apr  4 09:05:38 2007
@@ -52,7 +52,7 @@
      */
     protected void sendExchange(final Object expectedBody) {
         client.send(endpoint, new Processor<Exchange>() {
-            public void onExchange(Exchange exchange) {
+            public void process(Exchange exchange) {
                 Message in = exchange.getIn();
                 in.setBody(expectedBody);
                 in.setHeader("cheese", 123);

Modified: activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java (original)
+++ activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java Wed Apr  4 09:05:38 2007
@@ -47,7 +47,7 @@
             log.debug(endpoint + " receiving JMS message: " + message);
         }
         JmsExchange exchange = createExchange(message);
-        processor.onExchange((E) exchange);
+        processor.process((E) exchange);
     }
 
     public JmsExchange createExchange(Message message) {

Modified: activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java (original)
+++ activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java Wed Apr  4 09:05:38 2007
@@ -45,10 +45,10 @@
     public void onExchange(Exchange exchange) {
         // lets convert to the type of an exchange
         JmsExchange jmsExchange = endpoint.convertTo(JmsExchange.class, exchange);
-        onExchange(jmsExchange);
+        process(jmsExchange);
     }
 
-    public void onExchange(final JmsExchange exchange) {
+    public void process(final JmsExchange exchange) {
         template.send(endpoint.getDestination(), new MessageCreator() {
             public Message createMessage(Session session) throws JMSException {
                 Message message = endpoint.getBinding().makeJmsMessage(exchange.getIn(), session);

Modified: activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java (original)
+++ activemq/camel/trunk/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerProcessor.java Wed Apr  4 09:05:38 2007
@@ -40,6 +40,6 @@
 
     public void onMessage(Message message) {
         Exchange exchange = endpoint.createExchange(message);
-        processor.onExchange(exchange);
+        processor.process(exchange);
     }
 }

Modified: activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java (original)
+++ activemq/camel/trunk/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java Wed Apr  4 09:05:38 2007
@@ -66,7 +66,7 @@
 
     protected void sendExchange(final Object expectedBody) {
         client.send(endpoint, new Processor<JmsExchange>() {
-            public void onExchange(JmsExchange exchange) {
+            public void process(JmsExchange exchange) {
                 // now lets fire in a message
                 JmsMessage in = exchange.getIn();
                 in.setBody(expectedBody);
@@ -104,7 +104,7 @@
             public void configure() {
                 from("jms:queue:test.a").to("jms:queue:test.b");
                 from("jms:queue:test.b").process(new Processor<JmsExchange>() {
-                    public void onExchange(JmsExchange e) {
+                    public void process(JmsExchange e) {
                         System.out.println("Received exchange: " + e.getIn());
                         receivedExchange = e;
                         latch.countDown();

Modified: activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java (original)
+++ activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java Wed Apr  4 09:05:38 2007
@@ -65,7 +65,7 @@
                     if (lockEntity(result, entityManager)) {
                         // lets turn the result into an exchange and fire it into the processor
                         Exchange exchange = createExchange(result);
-                        getProcessor().onExchange(exchange);
+                        getProcessor().process(exchange);
                         getDeleteHandler().deleteObject(entityManager, result);
                     }
                 }

Modified: activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java (original)
+++ activemq/camel/trunk/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java Wed Apr  4 09:05:38 2007
@@ -40,7 +40,7 @@
         this.template = endpoint.createTransactionStrategy();
     }
 
-    public void onExchange(Exchange exchange) {
+    public void process(Exchange exchange) {
         final Object values = expression.evaluate(exchange);
         if (values != null) {
             template.execute(new JpaCallback() {

Modified: activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java (original)
+++ activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java Wed Apr  4 09:05:38 2007
@@ -69,7 +69,7 @@
 
         // lets produce some objects
         client.send(endpoint, new Processor<Exchange>() {
-            public void onExchange(Exchange exchange) {
+            public void process(Exchange exchange) {
                 exchange.getIn().setBody(new SendEmail("foo@bar.com"));
             }
         });
@@ -82,7 +82,7 @@
 
         // now lets create a consumer to consume it
         consumer = endpoint.createConsumer(new Processor<Exchange>() {
-            public void onExchange(Exchange e) {
+            public void process(Exchange e) {
                 log.info("Received exchange: " + e.getIn());
                 receivedExchange = e;
                 latch.countDown();

Modified: activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java (original)
+++ activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java Wed Apr  4 09:05:38 2007
@@ -73,7 +73,7 @@
 
         // lets produce some objects
         client.send(endpoint, new Processor<Exchange>() {
-            public void onExchange(Exchange exchange) {
+            public void process(Exchange exchange) {
                 exchange.getIn().setBody(new MultiSteps("foo@bar.com"));
             }
         });
@@ -86,7 +86,7 @@
 
         // now lets create a consumer to consume it
         consumer = endpoint.createConsumer(new Processor<Exchange>() {
-            public void onExchange(Exchange e) {
+            public void process(Exchange e) {
                 log.info("Received exchange: " + e.getIn());
                 receivedExchange = e;
                 latch.countDown();

Modified: activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java (original)
+++ activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java Wed Apr  4 09:05:38 2007
@@ -57,7 +57,7 @@
         IoHandler handler = new IoHandlerAdapter() {
             @Override
             public void messageReceived(IoSession session, Object object) throws Exception {
-                getProcessor().onExchange(endpoint.createExchange(session, object));
+                getProcessor().process(endpoint.createExchange(session, object));
             }
         };
 

Modified: activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java (original)
+++ activemq/camel/trunk/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java Wed Apr  4 09:05:38 2007
@@ -26,8 +26,6 @@
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoHandlerAdapter;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoServiceConfig;
-import org.apache.mina.transport.socket.nio.SocketConnectorConfig;
 
 import java.net.SocketAddress;
 
@@ -46,7 +44,7 @@
         this.endpoint = endpoint;
     }
 
-    public void onExchange(MinaExchange exchange) {
+    public void process(MinaExchange exchange) {
         if (session == null) {
             throw new IllegalStateException("Not started yet!");
         }

Modified: activemq/camel/trunk/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java (original)
+++ activemq/camel/trunk/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java Wed Apr  4 09:05:38 2007
@@ -49,7 +49,7 @@
         message.setHeader("cheese", 123);
 
         producer = endpoint.createProducer();
-        producer.onExchange(exchange);
+        producer.process(exchange);
 
         // now lets sleep for a while
         boolean received = latch.await(5, TimeUnit.SECONDS);
@@ -75,7 +75,7 @@
         return new RouteBuilder() {
             public void configure() {
                 from(uri).process(new Processor<MinaExchange>() {
-                    public void onExchange(MinaExchange e) {
+                    public void process(MinaExchange e) {
                         System.out.println("Received exchange: " + e.getIn());
                         receivedExchange = e;
                         latch.countDown();

Modified: activemq/camel/trunk/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original)
+++ activemq/camel/trunk/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Wed Apr  4 09:05:38 2007
@@ -73,7 +73,7 @@
         return ObjectConverter.toBoolean(evaluateScript(exchange));
     }
 
-    public void onExchange(E exchange) {
+    public void process(E exchange) {
         evaluateScript(exchange);
     }
 

Modified: activemq/camel/trunk/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java (original)
+++ activemq/camel/trunk/camel-script/src/test/java/org/apache/camel/builder/script/GroovyTest.java Wed Apr  4 09:05:38 2007
@@ -47,7 +47,7 @@
     }
 
     public void testProcessorMutatesTheExchange() throws Exception {
-        groovy("request.headers.myNewHeader = 'ABC'").onExchange(exchange);
+        groovy("request.headers.myNewHeader = 'ABC'").process(exchange);
 
         assertInMessageHeader(exchange, "myNewHeader", "ABC");
     }

Modified: activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java (original)
+++ activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java Wed Apr  4 09:05:38 2007
@@ -63,7 +63,7 @@
                 log.debug("<<<< message: " + message.getBody());
             }
             XmppExchange exchange = endpoint.createExchange(message);
-            getProcessor().onExchange(exchange);
+            getProcessor().process(exchange);
         }
         else if (packet instanceof RosterPacket) {
             RosterPacket rosterPacket = (RosterPacket) packet;

Modified: activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java (original)
+++ activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java Wed Apr  4 09:05:38 2007
@@ -18,7 +18,6 @@
 package org.apache.camel.component.xmpp;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -47,10 +46,10 @@
     public void onExchange(Exchange exchange) {
         // lets convert to the type of an exchange
         XmppExchange xmppExchange = endpoint.convertTo(XmppExchange.class, exchange);
-        onExchange(xmppExchange);
+        process(xmppExchange);
     }
 
-    public void onExchange(XmppExchange exchange) {
+    public void process(XmppExchange exchange) {
         // TODO it would be nice if we could reuse the message from the exchange
         Message message = chat.createMessage();
         message.setTo(room);

Modified: activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java (original)
+++ activemq/camel/trunk/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java Wed Apr  4 09:05:38 2007
@@ -18,7 +18,6 @@
 package org.apache.camel.component.xmpp;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -47,10 +46,10 @@
     public void onExchange(Exchange exchange) {
         // lets convert to the type of an exchange
         XmppExchange xmppExchange = endpoint.convertTo(XmppExchange.class, exchange);
-        onExchange(xmppExchange);
+        process(xmppExchange);
     }
 
-    public void onExchange(XmppExchange exchange) {
+    public void process(XmppExchange exchange) {
         // TODO it would be nice if we could reuse the message from the exchange
         Message message = chat.createMessage();
         message.setTo(participant);

Modified: activemq/camel/trunk/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java?view=diff&rev=525547&r1=525546&r2=525547
==============================================================================
--- activemq/camel/trunk/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java (original)
+++ activemq/camel/trunk/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java Wed Apr  4 09:05:38 2007
@@ -81,7 +81,7 @@
 
     protected void sendExchange(final Object expectedBody) {
         client.send(endpoint, new Processor<XmppExchange>() {
-            public void onExchange(XmppExchange exchange) {
+            public void process(XmppExchange exchange) {
                 // now lets fire in a message
                 XmppMessage in = exchange.getIn();
                 in.setBody(expectedBody);
@@ -121,7 +121,7 @@
                 public void configure() {
                     from(uri1).to(uri2);
                     from(uri2).process(new Processor<XmppExchange>() {
-                        public void onExchange(XmppExchange e) {
+                        public void process(XmppExchange e) {
                             log.info("Received exchange: " + e);
                             receivedExchange = e;
                             latch.countDown();



Mime
View raw message