camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r711229 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/model/dataformat/ camel-core/src/main/java/org/apache/camel/model/language/ camel-core/src/main/java/or...
Date Tue, 04 Nov 2008 11:37:00 GMT
Author: ningjiang
Date: Tue Nov  4 03:36:43 2008
New Revision: 711229

URL: http://svn.apache.org/viewvc?rev=711229&view=rev
Log:
Merged revisions 711206 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r711206 | ningjiang | 2008-11-04 16:09:44 +0800 (Tue, 04 Nov 2008) | 1 line
  
  CAMEL-1051 Get HandleFaultProcessor to work with AsyncProcessor
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Consume.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/InOnly.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Pattern.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/RecipientList.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeFalseTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/issues/MultipleFromTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayInterceptorTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/PEOPLE-HeaderAndTrailer.pzmap.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/HeaderAndTrailerTest-context.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/NoSplitRowsTest-context.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/MyConfigurableRoute2.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/anyLanguageFilter.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/javaScriptFilter.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/IAsyncService.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
  (props changed)
    activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest-context.xml
  (props changed)

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200
+/activemq/camel/trunk:709850,711200,711206

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov  4 03:36:43 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Consume.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/InOnly.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Pattern.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/RecipientList.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java:711206

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java?rev=711229&r1=711228&r2=711229&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java
(original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java
Tue Nov  4 03:36:43 2008
@@ -16,15 +16,60 @@
  */
 package org.apache.camel.processor;
 
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
 import org.apache.camel.CamelException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
+import org.apache.camel.util.AsyncProcessorHelper;
 
-public class HandleFaultProcessor extends DelegateProcessor {
+public class HandleFaultProcessor extends DelegateProcessor implements AsyncProcessor {
+    
+    @Override
+    public String toString() {
+        return "HandleFaultProcessor(" + processor + ")";
+    }
 
     @Override
     public void process(Exchange exchange) throws Exception {
-        super.process(exchange);
+        AsyncProcessorHelper.process(this, exchange);
+    }
+
+    public boolean process(final Exchange exchange, final AsyncCallback callback) {
+        if (processor == null) {
+            // no processor so nothing to process, so return
+            callback.done(true);
+            return true;
+        }      
+
+        if (processor instanceof AsyncProcessor) {
+            return ((AsyncProcessor)processor).process(exchange, new AsyncCallback() {
+                
+                public void done(boolean doneSynchronously) {
+                    callback.done(doneSynchronously);
+                    Message faultMessage = exchange.getFault(false);
+                    if (faultMessage != null) {
+                        final Object faultBody = faultMessage.getBody();
+                        if (faultBody != null) {
+                            faultMessage.setBody(null); // Reset it since we are handling
it.
+                            if (faultBody instanceof Throwable) {
+                                exchange.setException((Throwable)faultBody);
+                            } else {
+                                exchange.setException(new CamelException("Message contains
fault of type "
+                                    + faultBody.getClass().getName() + ":\n" + faultBody));
+                            }
+                        }
+                    }                    
+                }                
+            });
+        }
+        
+        try {
+            processor.process(exchange);
+        } catch (Throwable e) {
+            exchange.setException(e);
+        }
+        
         final Message faultMessage = exchange.getFault(false);
         if (faultMessage != null) {
             final Object faultBody = faultMessage.getBody();
@@ -38,5 +83,7 @@
                 }
             }
         }
+        callback.done(true);
+        return true;
     }
 }

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeFalseTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeFalseTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/issues/MultipleFromTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/MultipleFromTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayInterceptorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayInterceptorTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/PEOPLE-HeaderAndTrailer.pzmap.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-flatpack/src/test/resources/PEOPLE-HeaderAndTrailer.pzmap.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/HeaderAndTrailerTest-context.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/HeaderAndTrailerTest-context.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/NoSplitRowsTest-context.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/NoSplitRowsTest-context.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/MyConfigurableRoute2.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MyConfigurableRoute2.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/anyLanguageFilter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/anyLanguageFilter.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/javaScriptFilter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/javaScriptFilter.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/IAsyncService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/IAsyncService.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml:711206

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest-context.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 03:36:43 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest-context.xml:711206



Mime
View raw message