You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2013/11/02 19:35:10 UTC
[1/3] git commit: Polished camel broker component
Updated Branches:
refs/heads/trunk 6e49ef3a6 -> 1ad6bd59e
Polished camel broker component
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5469d806
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5469d806
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5469d806
Branch: refs/heads/trunk
Commit: 5469d806e8a8a94f774528fb65d6c52352ebce6f
Parents: 6e49ef3
Author: Claus Ibsen <cl...@gmail.com>
Authored: Sat Nov 2 19:27:00 2013 +0100
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Sat Nov 2 19:27:00 2013 +0100
----------------------------------------------------------------------
.../camel/component/broker/BrokerComponent.java | 3 +-
.../component/broker/BrokerConfiguration.java | 2 -
.../camel/component/broker/BrokerConsumer.java | 10 +++--
.../camel/component/broker/BrokerEndpoint.java | 7 +---
.../component/broker/BrokerJmsMessage.java | 12 +++---
.../camel/component/broker/BrokerProducer.java | 39 ++++++--------------
6 files changed, 25 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/5469d806/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java
index 3fce9ae..16edd30 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java
@@ -57,13 +57,12 @@ public class BrokerComponent extends UriEndpointComponent implements EndpointCom
remaining = removeStartingCharacters(remaining.substring(JmsConfiguration.TEMP_TOPIC_PREFIX.length()), '/');
}
-
ActiveMQDestination destination = ActiveMQDestination.createDestination(remaining, destinationType);
BrokerEndpoint brokerEndpoint = new BrokerEndpoint(uri, this, destination, brokerConfiguration);
+ setProperties(brokerEndpoint, parameters);
return brokerEndpoint;
}
-
@Override
public List<String> completeEndpointPath(ComponentConfiguration componentConfiguration, String completionText) {
String brokerName = String.valueOf(componentConfiguration.getParameter("brokerName"));
http://git-wip-us.apache.org/repos/asf/activemq/blob/5469d806/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java
index 583720e..6609533 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java
@@ -23,7 +23,6 @@ public class BrokerConfiguration {
@UriParam
private String brokerName = "";
-
public String getBrokerName() {
return brokerName;
}
@@ -32,5 +31,4 @@ public class BrokerConfiguration {
this.brokerName = brokerName;
}
-
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/5469d806/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConsumer.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConsumer.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConsumer.java
index 39b25e2..1dc52ae 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConsumer.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConsumer.java
@@ -25,11 +25,8 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.component.jms.JmsBinding;
import org.apache.camel.impl.DefaultConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class BrokerConsumer extends DefaultConsumer implements MessageInterceptor {
- protected final transient Logger logger = LoggerFactory.getLogger(BrokerConsumer.class);
private final JmsBinding jmsBinding = new JmsBinding();
public BrokerConsumer(Endpoint endpoint, Processor processor) {
@@ -58,7 +55,12 @@ public class BrokerConsumer extends DefaultConsumer implements MessageIntercepto
try {
getProcessor().process(exchange);
} catch (Exception e) {
- logger.error("Failed to process " + exchange, e);
+ exchange.setException(e);
+ }
+
+ if (exchange.getException() != null) {
+ getExceptionHandler().handleException("Error processing intercepted message: " + message, exchange, exchange.getException());
}
}
+
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/5469d806/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
index e327669..55e7f7b 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
@@ -38,15 +38,13 @@ import org.apache.camel.util.UnsafeUriCharactersEncoder;
@ManagedResource(description = "Managed Camel Broker Endpoint")
@UriEndpoint(scheme = "broker", consumerClass = BrokerConsumer.class)
-
public class BrokerEndpoint extends DefaultEndpoint implements MultipleConsumersSupport, Service {
+
static final String PRODUCER_BROKER_EXCHANGE = "producerBrokerExchange";
@UriParam
private final BrokerConfiguration configuration;
private MessageInterceptorRegistry messageInterceptorRegistry;
-
-
@UriPath
private final ActiveMQDestination destination;
private List<MessageInterceptor> messageInterceptorList = new CopyOnWriteArrayList<MessageInterceptor>();
@@ -70,7 +68,6 @@ public class BrokerEndpoint extends DefaultEndpoint implements MultipleConsumers
return consumer;
}
-
@Override
public boolean isSingleton() {
return false;
@@ -85,7 +82,6 @@ public class BrokerEndpoint extends DefaultEndpoint implements MultipleConsumers
return destination;
}
-
@Override
protected void doStart() throws Exception {
super.doStart();
@@ -111,7 +107,6 @@ public class BrokerEndpoint extends DefaultEndpoint implements MultipleConsumers
protected void removeMessageInterceptor(MessageInterceptor messageInterceptor) {
messageInterceptorRegistry.removeMessageInterceptor(destination, messageInterceptor);
-
}
protected void inject(ProducerBrokerExchange producerBrokerExchange, Message message) throws Exception {
http://git-wip-us.apache.org/repos/asf/activemq/blob/5469d806/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerJmsMessage.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerJmsMessage.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerJmsMessage.java
index 02dcabe..f77e97b 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerJmsMessage.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerJmsMessage.java
@@ -17,11 +17,14 @@
package org.apache.activemq.camel.component.broker;
import javax.jms.Message;
+
import org.apache.camel.component.jms.JmsBinding;
import org.apache.camel.component.jms.JmsMessage;
+import org.apache.camel.component.jms.JmsMessageHelper;
import org.apache.camel.util.ObjectHelper;
public class BrokerJmsMessage extends JmsMessage {
+
public BrokerJmsMessage(Message jmsMessage, JmsBinding binding) {
super(jmsMessage, binding);
}
@@ -29,12 +32,10 @@ public class BrokerJmsMessage extends JmsMessage {
@Override
public String toString() {
if (getJmsMessage() != null) {
- try {
- return "BrokerJmsMessage[JMSMessageID: " + getJmsMessage().getJMSMessageID();
- } catch (Exception e) {
- }
+ return "BrokerJmsMessage[JMSMessageID: " + JmsMessageHelper.getJMSMessageID(getJmsMessage());
+ } else {
+ return "BrokerJmsMessage@" + ObjectHelper.getIdentityHashCode(this);
}
- return "BrokerJmsMessage@" + ObjectHelper.getIdentityHashCode(this);
}
@Override
@@ -45,7 +46,6 @@ public class BrokerJmsMessage extends JmsMessage {
}
}
-
@Override
public BrokerJmsMessage newInstance() {
return new BrokerJmsMessage(null, getBinding());
http://git-wip-us.apache.org/repos/asf/activemq/blob/5469d806/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerProducer.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerProducer.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerProducer.java
index c12fbee..fcf1256 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerProducer.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerProducer.java
@@ -17,10 +17,8 @@
package org.apache.activemq.camel.component.broker;
import java.util.Map;
-import java.util.concurrent.RejectedExecutionException;
import org.apache.activemq.broker.ProducerBrokerExchange;
-import org.apache.activemq.camel.converter.ActiveMQMessageConverter;
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
@@ -30,7 +28,6 @@ import org.apache.camel.converter.ObjectConverter;
import org.apache.camel.impl.DefaultAsyncProducer;
public class BrokerProducer extends DefaultAsyncProducer {
- private final ActiveMQMessageConverter activeMQConverter = new ActiveMQMessageConverter();
private final BrokerEndpoint brokerEndpoint;
public BrokerProducer(BrokerEndpoint endpoint) {
@@ -38,24 +35,12 @@ public class BrokerProducer extends DefaultAsyncProducer {
brokerEndpoint = endpoint;
}
-
@Override
public boolean process(Exchange exchange, AsyncCallback callback) {
- // deny processing if we are not started
- if (!isRunAllowed()) {
- if (exchange.getException() == null) {
- exchange.setException(new RejectedExecutionException());
- }
- // we cannot process so invoke callback
- callback.done(true);
- return true;
- }
-
try {
//In the middle of the broker - InOut doesn't make any sense
//so we do in only
return processInOnly(exchange, callback);
-
} catch (Throwable e) {
// must catch exception to ensure callback is invoked as expected
// to let Camel error handling deal with this
@@ -74,8 +59,6 @@ public class BrokerProducer extends DefaultAsyncProducer {
ProducerBrokerExchange producerBrokerExchange = (ProducerBrokerExchange) exchange.getProperty(BrokerEndpoint.PRODUCER_BROKER_EXCHANGE);
brokerEndpoint.inject(producerBrokerExchange, message);
-
-
}
} catch (Exception e) {
exchange.setException(e);
@@ -85,34 +68,34 @@ public class BrokerProducer extends DefaultAsyncProducer {
}
private ActiveMQMessage getMessage(Exchange exchange) throws Exception {
- ActiveMQMessage result = null;
- Message camelMesssage = null;
+ ActiveMQMessage result;
+ Message camelMessage;
if (exchange.hasOut()) {
- camelMesssage = exchange.getOut();
+ camelMessage = exchange.getOut();
} else {
- camelMesssage = exchange.getIn();
+ camelMessage = exchange.getIn();
}
- Map<String, Object> headers = camelMesssage.getHeaders();
+ Map<String, Object> headers = camelMessage.getHeaders();
/**
* We purposely don't want to support injecting messages half-way through
* broker processing - use the activemq camel component for that - but
* we will support changing message headers and destinations
*/
- if (camelMesssage instanceof JmsMessage) {
- JmsMessage jmsMessage = (JmsMessage) camelMesssage;
+ if (camelMessage instanceof JmsMessage) {
+ JmsMessage jmsMessage = (JmsMessage) camelMessage;
if (jmsMessage.getJmsMessage() instanceof ActiveMQMessage) {
result = (ActiveMQMessage) jmsMessage.getJmsMessage();
//lets apply any new message headers
setJmsHeaders(result, headers);
} else {
-
- throw new IllegalStateException("not the original message from the broker " + jmsMessage.getJmsMessage());
+ throw new IllegalStateException("Not the original message from the broker " + jmsMessage.getJmsMessage());
}
} else {
- throw new IllegalStateException("not the original message from the broker " + camelMesssage);
+ throw new IllegalStateException("Not the original message from the broker " + camelMessage);
}
+
return result;
}
@@ -154,6 +137,6 @@ public class BrokerProducer extends DefaultAsyncProducer {
}
}
}
-
}
+
}
[2/3] git commit: Removed not use class,
which neither has ever been documentated,
or used by end users. Also they can implement their own spring JMS message
converter if they want.
Posted by da...@apache.org.
Removed not use class, which neither has ever been documentated, or used by end users. Also they can implement their own spring JMS message converter if they want.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/65be281c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/65be281c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/65be281c
Branch: refs/heads/trunk
Commit: 65be281c16b277c0adb647ec864414c4e36bcb03
Parents: 5469d80
Author: Claus Ibsen <cl...@gmail.com>
Authored: Sat Nov 2 19:32:44 2013 +0100
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Sat Nov 2 19:32:44 2013 +0100
----------------------------------------------------------------------
.../IdentityMessageReuseConverter.java | 56 ----------
.../activemq/camel/CamelRedeliveryTest.java | 109 -------------------
.../camel/CamelRedeliveryTest-context.xml | 48 --------
3 files changed, 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/65be281c/activemq-camel/src/main/java/org/apache/activemq/camel/converter/IdentityMessageReuseConverter.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/converter/IdentityMessageReuseConverter.java b/activemq-camel/src/main/java/org/apache/activemq/camel/converter/IdentityMessageReuseConverter.java
deleted file mode 100644
index bb3194c..0000000
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/converter/IdentityMessageReuseConverter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.camel.converter;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.apache.activemq.command.ActiveMQMessage;
-import org.springframework.jms.support.converter.MessageConversionException;
-import org.springframework.jms.support.converter.MessageConverter;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Identity conversion, return the original ActiveMQMessage as is, useful when camel does message
- * redelivery routing. ReadOnlyPropertes flag inverted to allow
- * additional properties to be appended or existing properties to be modified
- */
-public class IdentityMessageReuseConverter implements MessageConverter {
-
- /* (non-Javadoc)
- * @see org.springframework.jms.support.converter.MessageConverter#fromMessage(javax.jms.Message)
- */
- public Object fromMessage(Message message) throws JMSException, MessageConversionException {
- return message;
- }
-
- /* (non-Javadoc)
- * @see org.springframework.jms.support.converter.MessageConverter#toMessage(java.lang.Object, javax.jms.Session)
- */
- public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
- if (object instanceof ActiveMQMessage) {
- // allow setting additional properties
- ((ActiveMQMessage)object).setReadOnlyProperties(false);
- return (Message)object;
- } else {
- throw new MessageConversionException("Cannot reuse object of type [" +
- ObjectUtils.nullSafeClassName(object) + "] as ActiveMQMessage message. Message must already be an ActiveMQMessage.");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq/blob/65be281c/activemq-camel/src/test/java/org/apache/activemq/camel/CamelRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/CamelRedeliveryTest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/CamelRedeliveryTest.java
deleted file mode 100644
index a272766..0000000
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/CamelRedeliveryTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.camel;
-
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.RedeliveryPolicy;
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Handler;
-import org.apache.camel.RecipientList;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static org.junit.Assert.*;
-
-/**
- *
- */
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
-public class CamelRedeliveryTest {
- private static final transient Logger LOG = LoggerFactory.getLogger(CamelRedeliveryTest.class);
-
- @Autowired
- protected CamelContext camelContext;
-
- @Autowired
- protected ApplicationContext applicationContext;
-
- @Test
- public void testRedeliveryViaCamel() throws Exception {
-
-
- ActiveMQConnectionFactory factory = applicationContext.getBean("connectionFactory", ActiveMQConnectionFactory.class);
- ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection();
-
- // send message to dlq immediately
- RedeliveryPolicy policy = connection.getRedeliveryPolicy();
- policy.setMaximumRedeliveries(0);
- connection.start();
-
- Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
- ActiveMQQueue destination = new ActiveMQQueue("camelRedeliveryQ");
- MessageProducer producer = session.createProducer(destination);
-
- MessageConsumer consumer = session.createConsumer(destination);
- // Send the messages
- producer.send(session.createTextMessage("1st"));
- session.commit();
- LOG.info("sent 1st message");
-
- TextMessage m;
- m = (TextMessage)consumer.receive(1000);
- assertNotNull(m);
- assertEquals("1st", m.getText());
- session.rollback();
-
- LOG.info("received and rolledback 1st message: " + m);
- m = (TextMessage)consumer.receive(1);
- assertNull("no immediate redelivery", m);
-
- m = (TextMessage)consumer.receive(20000);
- LOG.info("received redelivery on second wait attempt, message: " + m);
-
- assertNotNull("got redelivery on second attempt", m);
- assertEquals("text matches original", "1st", m.getText());
-
- // came from camel
- assertTrue("redelivery marker header set, so came from camel", m.getBooleanProperty("CamelRedeliveryMarker"));
- }
-
- public static class DestinationExtractor {
-
- @RecipientList @Handler
- public String routeTo(ActiveMQMessage body) throws Exception {
- ActiveMQDestination originalDestination = body.getOriginalDestination();
- return "activemq:" + originalDestination.getPhysicalName() + "?explicitQosEnabled=true&messageConverter=#messageConverter";
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq/blob/65be281c/activemq-camel/src/test/resources/org/apache/activemq/camel/CamelRedeliveryTest-context.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/CamelRedeliveryTest-context.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/CamelRedeliveryTest-context.xml
deleted file mode 100644
index 4bef8ac..0000000
--- a/activemq-camel/src/test/resources/org/apache/activemq/camel/CamelRedeliveryTest-context.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- START SNIPPET: example -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
- <route>
- <from uri="activemq:ActiveMQ.DLQ?mapJmsMessage=false"/>
- <setHeader headerName="CamelRedeliveryMarker"><constant>true</constant></setHeader>
- <!-- delay redelivery by 1 second using schedualler, the determination
- of the delay can come form a processor to make it as complicated as needed -->
- <setHeader headerName="AMQ_SCHEDULED_DELAY"><constant>1000</constant></setHeader>
-
- <!-- dynamically configure the destination based on the message -->
- <to pattern="InOnly" uri="recipientListDestinationGenerator" />
- <!-- to pattern="InOnly" uri="activemq:camelRedeliveryQ?explicitQosEnabled=true&messageConverter=#messageConverter"/ -->
- </route>
- </camelContext>
-
- <bean id="connectionFactory" class="org.apache.activemq.spring.ActiveMQConnectionFactory">
- <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
- </bean>
-
- <bean id="messageConverter" class="org.apache.activemq.camel.converter.IdentityMessageReuseConverter" />
- <bean id="recipientListDestinationGenerator" class="org.apache.activemq.camel.CamelRedeliveryTest$DestinationExtractor" />
-
-</beans>
- <!-- END SNIPPET: example -->
[3/3] git commit: Removed non existing AMQ journal Camel component
which was removed a long time ago.
Posted by da...@apache.org.
Removed non existing AMQ journal Camel component which was removed a long time ago.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/1ad6bd59
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/1ad6bd59
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/1ad6bd59
Branch: refs/heads/trunk
Commit: 1ad6bd59ee60b622fc25749fe42a7570e105e92a
Parents: 65be281
Author: Claus Ibsen <cl...@gmail.com>
Authored: Sat Nov 2 19:34:18 2013 +0100
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Sat Nov 2 19:34:18 2013 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/activemq.journal | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/1ad6bd59/activemq-camel/src/main/resources/META-INF/services/org/apache/camel/component/activemq.journal
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/resources/META-INF/services/org/apache/camel/component/activemq.journal b/activemq-camel/src/main/resources/META-INF/services/org/apache/camel/component/activemq.journal
deleted file mode 100644
index bac5c46..0000000
--- a/activemq-camel/src/main/resources/META-INF/services/org/apache/camel/component/activemq.journal
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class=org.apache.activemq.camel.component.JournalComponent