Author: davsclaus
Date: Wed Jul 29 05:02:14 2009
New Revision: 798783
URL: http://svn.apache.org/viewvc?rev=798783&view=rev
Log:
CAMEL-1858: Applied patch thanks to Stan Lewis.
Added:
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
(with props)
Modified:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Modified:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=798783&r1=798782&r2=798783&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Wed Jul 29 05:02:14 2009
@@ -96,6 +96,14 @@
return
endpoint.getConfiguration().getMessageConverter().fromMessage(message);
}
+ // if we are configured to not map the jms message then return it
as body
+ if (endpoint != null &&
!endpoint.getConfiguration().isMapJmsMessage()) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Option map JMS message is false so using JMS
message as body: " + message);
+ }
+ return message;
+ }
+
if (message instanceof ObjectMessage) {
ObjectMessage objectMessage = (ObjectMessage)message;
return objectMessage.getObject();
Modified:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=798783&r1=798782&r2=798783&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Wed Jul 29 05:02:14 2009
@@ -110,6 +110,7 @@
private boolean replyToDeliveryPersistent = true;
private long timeToLive = -1;
private MessageConverter messageConverter;
+ private boolean mapJmsMessage = true;
private boolean messageIdEnabled = true;
private boolean messageTimestampEnabled = true;
private int priority = -1;
@@ -672,6 +673,14 @@
this.messageConverter = messageConverter;
}
+ public boolean isMapJmsMessage() {
+ return mapJmsMessage;
+ }
+
+ public void setMapJmsMessage(boolean mapJmsMessage) {
+ this.mapJmsMessage = mapJmsMessage;
+ }
+
public boolean isMessageIdEnabled() {
return messageIdEnabled;
}
Added:
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java?rev=798783&view=auto
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
(added)
+++
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
Wed Jul 29 05:02:14 2009
@@ -0,0 +1,73 @@
+/**
+ * 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.camel.component.jms;
+
+import javax.jms.BytesMessage;
+import javax.jms.ConnectionFactory;
+import javax.jms.TextMessage;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
+
+/**
+ * @version $Revision$
+ */
+public class MapJmsMessageTest extends ContextTestSupport {
+
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext camelContext = super.createCamelContext();
+
+ ConnectionFactory connectionFactory = new
ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+ camelContext.addComponent("activemq",
jmsComponentClientAcknowledge(connectionFactory));
+
+ return camelContext;
+ }
+
+ public void testTextMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(TextMessage.class);
+
+ template.sendBody("activemq:queue:hello", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testBytesMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(BytesMessage.class);
+
+ template.sendBody("activemq:queue:hello", "Hello World".getBytes());
+
+ assertMockEndpointsSatisfied();
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+
from("activemq:queue:hello?mapJmsMessage=false").to("mock:result");
+ }
+ };
+ }
+
+}
Propchange:
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
