Author: ningjiang
Date: Thu Jul 10 00:46:19 2008
New Revision: 675468
URL: http://svn.apache.org/viewvc?rev=675468&view=rev
Log:
CAMEL-688, CAMEL-689 , Also fixed some CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
Thu Jul 10 00:46:19 2008
@@ -108,7 +108,7 @@
}
try {
Object value = invocation.proceed();
- if (value != null) {
+ if (value != null && exchange.getPattern().isOutCapable()) {
exchange.getOut().setBody(value);
}
} catch (InvocationTargetException e) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
Thu Jul 10 00:46:19 2008
@@ -17,6 +17,7 @@
package org.apache.camel.language.bean;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.bean.RegistryBean;
import org.apache.camel.impl.ExpressionSupport;
@@ -51,6 +52,10 @@
}
try {
Exchange newExchange = exchange.copy();
+ // check the exchange pattern
+ if (!newExchange.getPattern().isOutCapable()) {
+ newExchange.setPattern(ExchangePattern.InOut);
+ }
processor.process(newExchange);
return newExchange.getOut(true).getBody();
} catch (Exception e) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
Thu Jul 10 00:46:19 2008
@@ -280,9 +280,15 @@
protected void find(Test test, String packageName, ClassLoader loader) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Searching for: " + test + " in package: " + packageName
+ " using classloader: " + loader);
+ LOG.trace("Searching for: " + test + " in package: " + packageName
+ " using classloader: "
+ + loader.getClass().getName());
+ }
+ if (loader.getClass().getName().endsWith(
+ "org.apache.felix.framework.searchpolicy.ContentClassLoader"))
{
+ //this classloader is in OSGI env which is not URLClassloader, we
should resort to the
+ //BundleDelegatingClassLoader in OSGI, so just return
+ return;
}
-
try {
Method mth = loader.getClass().getMethod("getBundle", new Class[]
{});
if (mth != null) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
Thu Jul 10 00:46:19 2008
@@ -1,12 +1,24 @@
+/**
+ * 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.util;
+import java.io.IOException;
import java.net.URL;
-import java.net.MalformedURLException;
import java.util.Enumeration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-import java.io.IOException;
import org.apache.camel.impl.converter.AnnotationTypeConverterLoader;
@@ -40,7 +52,7 @@
protected Enumeration<URL> getResources(ClassLoader loader, String
packageName) throws IOException {
// try super first, just in vase
Enumeration<URL> enumeration = super.getResources(loader, packageName);
- if (! enumeration.hasMoreElements()) {
+ if (!enumeration.hasMoreElements()) {
LOG.trace("Using WebSphere workaround to load the camel jars with
the annotated converters.");
// Special WebSphere trick to load a file that exists in the JAR
and then let it go from there.
// The trick is that we just need the URL's for the .jars that
contains the type
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
Thu Jul 10 00:46:19 2008
@@ -20,6 +20,7 @@
import org.apache.camel.Body;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.BeanRouteTest;
@@ -38,13 +39,13 @@
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedBodiesReceived(1, 2);
- template.sendBody("direct:start", "first");
+ template.sendBody("direct:start", ExchangePattern.InOut, "first");
// lets simulate spring's factory bean stuff
jndiContext.unbind("myBean");
jndiContext.bind("myBean", new MyBean());
- template.sendBody("direct:start", "second");
+ template.sendBody("direct:start", ExchangePattern.InOut, "second");
assertMockEndpointsSatisifed();
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
Thu Jul 10 00:46:19 2008
@@ -17,8 +17,8 @@
package org.apache.camel.component.direct;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Processor;
import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -43,5 +43,5 @@
}
};
}
-
+
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/BeanTest.java
Thu Jul 10 00:46:19 2008
@@ -19,14 +19,17 @@
import javax.naming.Context;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Header;
import org.apache.camel.LanguageTestSupport;
import org.apache.camel.Message;
+import org.apache.camel.impl.DefaultExchange;
/**
* @version $Revision$
*/
public class BeanTest extends LanguageTestSupport {
+
public void testSimpleExpressions() throws Exception {
assertExpression("foo.cheese", "abc");
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java
Thu Jul 10 00:46:19 2008
@@ -19,6 +19,7 @@
import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Header;
import org.apache.camel.builder.RouteBuilder;
@@ -30,7 +31,7 @@
String body = "<person name='James' city='London'/>";
getMockEndpoint("mock:result").expectedBodiesReceived(body);
- template.sendBodyAndHeader("direct:start", body, "foo", "London");
+ template.sendBodyAndHeader("direct:start", ExchangePattern.InOut,
body, "foo", "London");
assertMockEndpointsSatisifed();
}
@@ -39,7 +40,7 @@
String body = "<person name='Hiram' city='Tampa'/>";
getMockEndpoint("mock:result").expectedMessageCount(0);
- template.sendBodyAndHeader("direct:start", body, "foo", "Tampa");
+ template.sendBodyAndHeader("direct:start", ExchangePattern.InOut,
body, "foo", "Tampa");
assertMockEndpointsSatisifed();
}
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Thu Jul 10 00:46:19 2008
@@ -17,15 +17,16 @@
package org.apache.camel.component.jms;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
import java.util.Arrays;
+import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.Date;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+
import javax.jms.BytesMessage;
import javax.jms.Destination;
import javax.jms.JMSException;
@@ -36,7 +37,6 @@
import javax.jms.StreamMessage;
import javax.jms.TextMessage;
import javax.xml.transform.TransformerException;
-
import org.w3c.dom.Node;
import org.apache.camel.CamelContext;
@@ -48,6 +48,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+
/**
* A Strategy used to convert between a Camel [EMAIL PROTECTED] JmsExchange}
and [EMAIL PROTECTED] JmsMessage}
* to and from a JMS [EMAIL PROTECTED] Message}
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java
Thu Jul 10 00:46:19 2008
@@ -1,3 +1,19 @@
+/**
+ * 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.issues;
import java.io.Serializable;
@@ -67,10 +83,13 @@
}
public String toString() {
- return "DummyOrder{" +
- "orderId=" + orderId +
- ", itemId=" + itemId +
- ", quantity=" + quantity +
- '}';
+ return "DummyOrder{"
+ + "orderId="
+ + orderId
+ + ", itemId="
+ + itemId
+ + ", quantity="
+ + quantity
+ + '}';
}
}
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
Thu Jul 10 00:46:19 2008
@@ -23,6 +23,7 @@
import org.apache.camel.Body;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.mock.MockEndpoint;
@@ -59,7 +60,7 @@
MockEndpoint mock = getMockEndpoint("mock:approve");
mock.expectedBodiesReceived("Yes");
- template.sendBodyAndHeader("direct:approve", "James",
+ template.sendBodyAndHeader("direct:approve", ExchangePattern.InOut,
"James",
BeanProcessor.METHOD_NAME, "approveLoan");
mock.assertIsSatisfied();
@@ -69,7 +70,7 @@
MockEndpoint mock = getMockEndpoint("mock:approve");
mock.expectedBodiesReceived("Yes");
- template.sendBodyAndHeader("activemq:approve", "James",
+ template.sendBodyAndHeader("activemq:approve", ExchangePattern.InOut,
"James",
BeanProcessor.METHOD_NAME, "approveLoan");
mock.assertIsSatisfied();
@@ -80,7 +81,7 @@
MockEndpoint mock = getMockEndpoint("mock:approve");
mock.expectedBodiesReceived("No");
- template.sendBodyAndHeader("activemq:queue", "James",
+ template.sendBodyAndHeader("activemq:queue", ExchangePattern.InOut,
"James",
BeanProcessor.METHOD_NAME, "approveSuperLoan");
mock.assertIsSatisfied();
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
Thu Jul 10 00:46:19 2008
@@ -18,6 +18,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -26,9 +27,9 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
/**
* Concurrent consumer with JMSReply test.
*/
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
Thu Jul 10 00:46:19 2008
@@ -1,17 +1,31 @@
+/**
+ * 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.issues;
import java.util.HashMap;
import java.util.Map;
-import static
org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
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.activemq.camel.component.ActiveMQComponent.activeMQComponent;
+
public class JmsHeaderAsObjectTest extends ContextTestSupport {
public void testSendHeaderAsPrimitiveOnly() throws Exception {
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java
Thu Jul 10 00:46:19 2008
@@ -1,3 +1,19 @@
+/**
+ * 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.issues;
import org.apache.camel.CamelContext;
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
Thu Jul 10 00:46:19 2008
@@ -26,6 +26,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.BrowsableQueueTest;
@@ -51,7 +52,7 @@
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedBodiesReceived("Result");
- template.sendBody(endpointUri, expectedBody);
+ template.sendBody(endpointUri, ExchangePattern.InOut, expectedBody);
endpoint.assertIsSatisfied();
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
Thu Jul 10 00:46:19 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring.bind;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,7 +31,7 @@
MockEndpoint mock = resolveMandatoryEndpoint("mock:results",
MockEndpoint.class);
mock.expectedBodiesReceived("Hello James!");
- template.sendBody("direct:start", body);
+ template.sendBody("direct:start", ExchangePattern.InOut, body);
mock.assertIsSatisfied();
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java?rev=675468&r1=675467&r2=675468&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/MyFailureProcessor.java
Thu Jul 10 00:46:19 2008
@@ -16,8 +16,8 @@
*/
package org.apache.camel.spring.config;
-import org.apache.camel.Processor;
import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
/**
* For unit test.
@@ -27,5 +27,5 @@
public void process(Exchange exchange) throws Exception {
throw new IllegalArgumentException("Unit test - this is thrown by
intention");
}
-
+
}
