Author: ningjiang
Date: Wed Jan 21 20:16:49 2009
New Revision: 736555
URL: http://svn.apache.org/viewvc?rev=736555&view=rev
Log:
Revert the change of removing TopicLoadBalancer
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java
- copied unchanged from r736286,
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java
- copied unchanged from r736286,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java (props
changed)
camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java (props
changed)
camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java (props
changed)
camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java
(props changed)
camel/trunk/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
(props changed)
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
(props changed)
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
(props changed)
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
(props changed)
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
(props changed)
camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/browse
(props changed)
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index
camel/trunk/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoMultipleConsumersTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadManuelTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/MultipleFromTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayInterceptorTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentConsumerTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentTrunkStoreTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IntercepWithPredicateTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedHeaderTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterMethodCallTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/InterceptAlterMessageBeforeRedeliveryTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionFromChoiceTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRetryUntilTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWrappedExceptionTest.java
(props changed)
camel/trunk/camel-core/src/test/java/org/apache/camel/util/CollectionHelperTest.java
(props changed)
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java
(props changed)
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
(props changed)
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
(props changed)
camel/trunk/components/camel-flatpack/src/test/resources/PEOPLE-HeaderAndTrailer.pzmap.xml
(props changed)
camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/HeaderAndTrailerTest-context.xml
(props changed)
camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/NoSplitRowsTest-context.xml
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
(props changed)
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
(props changed)
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
(props changed)
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
(props changed)
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
(props changed)
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
(props changed)
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MyConfigurableRoute2.java
(props changed)
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
(props changed)
camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java
(props changed)
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
(props changed)
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
(props changed)
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
(props changed)
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
(props changed)
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
(props changed)
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
(props changed)
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
(props changed)
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
(props changed)
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
(props changed)
camel/trunk/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/fileConsumerJpaIdempotentTest-config.xml
(props changed)
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
(props changed)
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
(props changed)
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
(props changed)
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/
(props changed)
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
(props changed)
camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
(props changed)
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
(props changed)
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
(props changed)
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
(props changed)
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
(props changed)
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/anyLanguageFilter.xml
(props changed)
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
(props changed)
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/javaScriptFilter.xml
(props changed)
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/RedeliveryPolicyReTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/IAsyncService.java
(props changed)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setExchangePattern.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterMethodCallTest.xml
(props changed)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest-context.xml
(props changed)
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
(props changed)
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
(props changed)
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientStop.java
(props changed)
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
(props changed)
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
('svn:mergeinfo' removed)
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java
('svn:mergeinfo' removed)
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java
('svn:mergeinfo' removed)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java?rev=736555&r1=736554&r2=736555&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
Wed Jan 21 20:16:49 2009
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.browse;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -26,9 +28,10 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.Service;
-import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.processor.loadbalancer.LoadBalancerConsumer;
+import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
import org.apache.camel.spi.BrowsableEndpoint;
/**
@@ -39,10 +42,9 @@
*/
public class BrowseEndpoint extends DefaultEndpoint implements
BrowsableEndpoint, Service {
private List<Exchange> exchanges;
- private Processor processor;
-
- public BrowseEndpoint() {
- }
+ private TopicLoadBalancer loadBalancer = new TopicLoadBalancer();
+ // TODO: firing of property changes not implemented
+ private PropertyChangeSupport propertyChangeSupport = new
PropertyChangeSupport(this);
public BrowseEndpoint(String uri, CamelContext camelContext) {
super(uri, camelContext);
@@ -64,6 +66,18 @@
return exchanges;
}
+ public TopicLoadBalancer getLoadBalancer() {
+ return loadBalancer;
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener listener) {
+ propertyChangeSupport.addPropertyChangeListener(listener);
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ propertyChangeSupport.removePropertyChangeListener(listener);
+ }
+
public Producer createProducer() throws Exception {
return new DefaultProducer(this) {
public void process(Exchange exchange) throws Exception {
@@ -73,8 +87,7 @@
}
public Consumer createConsumer(Processor processor) throws Exception {
- this.processor = processor;
- return new DefaultConsumer(this, processor);
+ return new LoadBalancerConsumer(this, processor, loadBalancer);
}
protected List<Exchange> createExchangeList() {
@@ -88,13 +101,10 @@
* @throws Exception is thrown if failed to process the exchange
*/
protected void onExchange(Exchange exchange) throws Exception {
- // add a copy of the Exchange at the given time
- exchanges.add(exchange.copy());
+ exchanges.add(exchange);
- // lets continue processing if there are any consumers
- if (processor != null) {
- processor.process(exchange);
- }
+ // lets fire any consumers
+ loadBalancer.process(exchange);
}
public void start() throws Exception {
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
('svn:mergeinfo' removed)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java?rev=736555&r1=736554&r2=736555&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
Wed Jan 21 20:16:49 2009
@@ -34,11 +34,13 @@
import org.apache.camel.model.loadbalancer.RandomLoadBalanceStrategy;
import org.apache.camel.model.loadbalancer.RoundRobinLoadBalanceStrategy;
import org.apache.camel.model.loadbalancer.StickyLoadBalanceStrategy;
+import org.apache.camel.model.loadbalancer.TopicLoadBalanceStrategy;
import org.apache.camel.processor.SendProcessor;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.RandomLoadBalancer;
import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
import org.apache.camel.processor.loadbalancer.StickyLoadBalancer;
+import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CollectionStringBuffer;
@@ -54,7 +56,8 @@
@XmlElements({
@XmlElement(required = false, name = "roundRobin", type =
RoundRobinLoadBalanceStrategy.class),
@XmlElement(required = false, name = "random", type =
RandomLoadBalanceStrategy.class),
- @XmlElement(required = false, name = "sticky", type =
StickyLoadBalanceStrategy.class)}
+ @XmlElement(required = false, name = "sticky", type =
StickyLoadBalanceStrategy.class),
+ @XmlElement(required = false, name = "topic", type =
TopicLoadBalanceStrategy.class)}
)
private LoadBalancerType loadBalancerType;
@@ -173,6 +176,16 @@
return this;
}
+ /**
+ * Uses topic load balancer
+ *
+ * @return the builder
+ */
+ public LoadBalanceType topic() {
+ loadBalancerType = new LoadBalancerType(new TopicLoadBalancer());
+ return this;
+ }
+
@Override
public String getLabel() {
CollectionStringBuffer buffer = new CollectionStringBuffer();
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/browse
('svn:mergeinfo' removed)
Modified:
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index?rev=736555&r1=736554&r2=736555&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index
(original)
+++
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index
Wed Jan 21 20:16:49 2009
@@ -17,4 +17,5 @@
LoadBalancerType
RandomLoadBalanceStrategy
RoundRobinLoadBalanceStrategy
-StickyLoadBalanceStrategy
\ No newline at end of file
+StickyLoadBalanceStrategy
+TopicLoadBalanceStrategy
\ No newline at end of file
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoMultipleConsumersTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadManuelTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentReferencePropertiesTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/MultipleFromTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayInterceptorTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentConsumerTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentTrunkStoreTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IntercepWithPredicateTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedHeaderTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetExchangePatternTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterMethodCallTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/InterceptAlterMessageBeforeRedeliveryTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionFromChoiceTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRetryUntilTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWrappedExceptionTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/util/CollectionHelperTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/HeaderAndTrailerTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/NoSplitRowsTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-flatpack/src/test/resources/PEOPLE-HeaderAndTrailer.pzmap.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/HeaderAndTrailerTest-context.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/NoSplitRowsTest-context.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MyConfigurableRoute2.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcOptionsTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamAsExchangeHeaderTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/fileConsumerJpaIdempotentTest-config.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/xqueryExampleTest.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/anyLanguageFilter.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-script/src/test/resources/org/apache/camel/builder/script/example/javaScriptFilter.xml
('svn:mergeinfo' removed)
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java?rev=736555&r1=736554&r2=736555&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
Wed Jan 21 20:16:49 2009
@@ -16,22 +16,22 @@
*/
package org.apache.camel.component.event;
-import java.util.ArrayList;
-
import org.apache.camel.Exchange;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.processor.MulticastProcessor;
+import org.apache.camel.processor.loadbalancer.LoadBalancer;
+import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
import org.apache.camel.util.ObjectHelper;
-import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationEvent;
+import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
+
/**
* An <a href="http://activemq.apache.org/camel/event.html";>Event Endpoint</a>
@@ -40,7 +40,7 @@
* @version $Revision$
*/
public class EventEndpoint extends DefaultEndpoint implements
ApplicationContextAware {
- private MulticastProcessor processor;
+ private LoadBalancer loadBalancer;
private ApplicationContext applicationContext;
public EventEndpoint(String endpointUri, EventComponent component) {
@@ -82,27 +82,35 @@
Exchange exchange = createExchange();
exchange.getIn().setBody(event);
try {
- getMulticastProcessor().process(exchange);
+ getLoadBalancer().process(exchange);
} catch (Exception e) {
throw wrapRuntimeCamelException(e);
}
}
- protected synchronized MulticastProcessor getMulticastProcessor() {
- if (processor == null) {
- processor = new MulticastProcessor(new ArrayList<Processor>());
+ public LoadBalancer getLoadBalancer() {
+ if (loadBalancer == null) {
+ loadBalancer = createLoadBalancer();
}
- return processor;
+ return loadBalancer;
+ }
+
+ public void setLoadBalancer(LoadBalancer loadBalancer) {
+ this.loadBalancer = loadBalancer;
}
// Implementation methods
//
-------------------------------------------------------------------------
public synchronized void consumerStarted(EventConsumer consumer) {
- getMulticastProcessor().getProcessors().add(consumer.getProcessor());
+ getLoadBalancer().addProcessor(consumer.getProcessor());
}
public synchronized void consumerStopped(EventConsumer consumer) {
-
getMulticastProcessor().getProcessors().remove(consumer.getProcessor());
+ getLoadBalancer().removeProcessor(consumer.getProcessor());
+ }
+
+ protected LoadBalancer createLoadBalancer() {
+ return new TopicLoadBalancer();
}
protected ApplicationEvent toApplicationEvent(Exchange exchange) {
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=736555&r1=736554&r2=736555&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Wed Jan 21 20:16:49 2009
@@ -38,6 +38,7 @@
import org.apache.camel.model.loadbalancer.RandomLoadBalanceStrategy;
import org.apache.camel.model.loadbalancer.RoundRobinLoadBalanceStrategy;
import org.apache.camel.model.loadbalancer.StickyLoadBalanceStrategy;
+import org.apache.camel.model.loadbalancer.TopicLoadBalanceStrategy;
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.spring.CamelContextFactoryBean;
@@ -90,6 +91,7 @@
addBeanDefinitionParser("roundRobin",
RoundRobinLoadBalanceStrategy.class);
addBeanDefinitionParser("random", RandomLoadBalanceStrategy.class);
addBeanDefinitionParser("sticky", StickyLoadBalanceStrategy.class);
+ addBeanDefinitionParser("topic", TopicLoadBalanceStrategy.class);
// jmx agent
addBeanDefinitionParser("jmxAgent", CamelJMXAgentType.class);
Propchange:
camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/component/spring-event
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/DelayerInterceptorTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TracerConfigurationTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterMethodCallTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/DeadLetterChannelHandledExampleTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/RedeliveryPolicyReTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/IAsyncService.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/delayerInterceptorTest.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setExchangePattern.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterMethodCallTest.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/SpringRemotingWithOneWayTest-context.xml
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientStop.java
('svn:mergeinfo' removed)
Propchange:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
('svn:mergeinfo' removed)
