svn commit: r711235 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/management/ camel-core/src/main/java/org/apache/camel/model/dataformat/ camel-core/src/main/java/org/ap...

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r711235 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/management/ camel-core/src/main/java/org/apache/camel/model/dataformat/ camel-core/src/main/java/org/ap...

ningjiang
Author: ningjiang
Date: Tue Nov  4 04:04:15 2008
New Revision: 711235

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

........
  r711219 | ningjiang | 2008-11-04 17:55:07 +0800 (Tue, 04 Nov 2008) | 1 line
 
  CAMEL-1052 Better toString method for the child class of DelegateProcessor
........

  Also removed the annoying svn:mergeinfo property for the file.

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/management/InstrumentationProcessor.java
    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/DelegateAsyncProcessor.java
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.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 04:04:15 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206
+/activemq/camel/trunk:709850,711200,711206,711219

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

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Consume.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/InOnly.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Pattern.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/RecipientList.java
            ('svn:mergeinfo' removed)

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=711235&r1=711234&r2=711235&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java Tue Nov  4 04:04:15 2008
@@ -41,6 +41,11 @@
 
     public InstrumentationProcessor() {
     }
+    
+    @Override
+    public String toString() {
+        return "Instrumentation(" + processor + ")";
+    }
 
     public void setCounter(PerformanceCounter counter) {
         this.counter = counter;

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java
            ('svn:mergeinfo' removed)

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java?rev=711235&r1=711234&r2=711235&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/DelegateAsyncProcessor.java Tue Nov  4 04:04:15 2008
@@ -39,7 +39,7 @@
 
     @Override
     public String toString() {
-        return "Delegate(" + processor + ")";
+        return "DelegateAsync(" + processor + ")";
     }
 
     public AsyncProcessor getProcessor() {

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java?rev=711235&r1=711234&r2=711235&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java Tue Nov  4 04:04:15 2008
@@ -50,6 +50,6 @@
 
     @Override
     public String toString() {
-        return "transform(" + expression + ")";
+        return "transform(" + expression + "," +processor + ")";
     }
 }

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java?rev=711235&r1=711234&r2=711235&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java Tue Nov  4 04:04:15 2008
@@ -32,6 +32,11 @@
         super(processor);
     }
     
+    @Override
+    public String toString() {
+        return "UnitOfWrok(" + processor + ")";
+    }
+    
     public boolean process(final Exchange exchange, final AsyncCallback callback) {
         if (exchange.getUnitOfWork() == null) {
             // If there is no existing UoW, then we should start one and

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java?rev=711235&r1=711234&r2=711235&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java Tue Nov  4 04:04:15 2008
@@ -56,7 +56,7 @@
 
     @Override
     public String toString() {
-        return "StreamCachingInterceptor";
+        return "StreamCachingInterceptor(" + processor + ")";
     }
 
     /**

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeFalseTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/issues/MultipleFromTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/DelayInterceptorTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/PEOPLE-HeaderAndTrailer.pzmap.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/HeaderAndTrailerTest-context.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/NoSplitRowsTest-context.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-guice/src/test/java/org/apache/camel/guice/MyConfigurableRoute2.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/anyLanguageFilter.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/javaScriptFilter.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/IAsyncService.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
            ('svn:mergeinfo' removed)

Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest-context.xml
            ('svn:mergeinfo' removed)