You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/08/05 14:50:00 UTC
svn commit: r801196 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/test/java/org/apache/camel/component/bean/issues/
tests/camel-itest/src/test/java/org/apache/camel/itest/issues/
tests/camel-itest/src/test/...
Author: davsclaus
Date: Wed Aug 5 12:49:59 2009
New Revision: 801196
URL: http://svn.apache.org/viewvc?rev=801196&view=rev
Log:
CAMEL-1878: bean component should always use explict method if given. In very rare cases it could select a Processor converter over this method., eg when having AMQ in the classpath and your beans implements javax.jms.MessageListener. Yeah talk about rare cases.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java (with props)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageListener.java (with props)
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageToProcessorConverter.java (with props)
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BaseClass.java (with props)
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java (with props)
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/DerivedClass.java (with props)
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BaseClass.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/DerivedClass.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=801196&r1=801195&r2=801196&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Wed Aug 5 12:49:59 2009
@@ -66,17 +66,24 @@
}
public void process(Exchange exchange) throws Exception {
+ // do we have am explict method name we always should invoke
+ boolean isExplicitMethod = ObjectHelper.isNotEmpty(method);
+
Object bean = beanHolder.getBean();
exchange.setProperty(Exchange.BEAN_HOLDER, beanHolder);
-
- Processor processor = getProcessor();
BeanInfo beanInfo = beanHolder.getBeanInfo();
// do we have a custom adapter for this POJO to a Processor
- if (processor != null) {
+ // should not be invoced if an explict method has been set
+ Processor processor = getProcessor();
+ if (!isExplicitMethod && processor != null) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Using a custom adapter as bean invocation: " + processor);
+ }
processor.process(exchange);
return;
}
+
Message in = exchange.getIn();
if (in.getHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY) == null) {
@@ -89,23 +96,20 @@
return;
}
- boolean isExplicitMethod = false;
String prevMethod = null;
MethodInvocation invocation;
if (methodObject != null) {
invocation = beanInfo.createInvocation(methodObject, bean, exchange);
} else {
// we just override the bean's invocation method name here
- if (ObjectHelper.isNotEmpty(method)) {
+ if (isExplicitMethod) {
prevMethod = in.getHeader(Exchange.BEAN_METHOD_NAME, String.class);
in.setHeader(Exchange.BEAN_METHOD_NAME, method);
- isExplicitMethod = true;
}
invocation = beanInfo.createInvocation(bean, exchange);
}
if (invocation == null) {
- throw new IllegalStateException(
- "No method invocation could be created, no maching method could be found on: " + bean);
+ throw new IllegalStateException("No method invocation could be created, no maching method could be found on: " + bean);
} else {
// set method name if not explicit given
if (method == null) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BaseClass.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BaseClass.java?rev=801196&r1=801195&r2=801196&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BaseClass.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BaseClass.java Wed Aug 5 12:49:59 2009
@@ -19,9 +19,9 @@
/**
* @version $Revision$
*/
-public class BaseClass {
+public class BaseClass implements MyMessageListener {
- public void onMessage(String message) {
+ public void onMessage(MyMessage message) {
// noop
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java?rev=801196&r1=801195&r2=801196&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java Wed Aug 5 12:49:59 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.bean.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -27,27 +28,83 @@
private DerivedClass derived = new DerivedClass();
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
public void testDerivedClassCalled() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .to("bean:derived?method=process");
+ }
+ });
+ context.start();
+
template.sendBody("direct:start", "Hello World");
- assertEquals("Derived class should have been invoked", "Hello World", derived.getBody());
+ assertEquals("Derived class should have been invoked", "Hello World", derived.getAndClearBody());
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("derived", derived);
- return jndi;
+ @SuppressWarnings("unchecked")
+ public void testDerivedClassCalledWithNoCustomProcessor() throws Exception {
+ context.getTypeConverterRegistry().addTypeConverter(Processor.class, MyMessageListener.class, new MyMessageToProcessorConverter());
+
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .to("bean:derived?method=process");
+
+ from("direct:other")
+ .to("bean:derived");
+ }
+ });
+ context.start();
+
+ Object out = template.requestBody("direct:start", "Hello World");
+ assertEquals("Derived class should have been invoked", "Hello World", derived.getAndClearBody());
+ assertEquals("Hello World", out.toString());
+
+ out = template.requestBody("direct:other", new MyMessage("Hello World"));
+ assertEquals("Derived class should NOT have been invoked", null, derived.getAndClearBody());
+ assertEquals("Bye World", out.toString());
}
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
+ @SuppressWarnings("unchecked")
+ public void testDerivedClassCalledWithCustomProcessor() throws Exception {
+ context.getTypeConverterRegistry().addTypeConverter(Processor.class, MyMessageListener.class, new MyMessageToProcessorConverter());
+
+ context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
+ // explict method name given so always call this
from("direct:start")
.to("bean:derived?method=process");
+
+ // no explicy method name then a custom processor can kick in
+ from("direct:other")
+ .to("bean:derived");
}
- };
+ });
+ context.start();
+
+ Object out = template.requestBody("direct:start", new MyMessage("Hello World"));
+ assertEquals("Derived class should have been invoked", "Hello World", derived.getAndClearBody());
+ assertEquals("Hello World", out.toString());
+
+ out = template.requestBody("direct:other", new MyMessage("Hello World"));
+ assertEquals("Derived class should NOT have been invoked", null, derived.getAndClearBody());
+ assertEquals("Bye World", out.toString());
}
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("derived", derived);
+ return jndi;
+ }
+
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/DerivedClass.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/DerivedClass.java?rev=801196&r1=801195&r2=801196&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/DerivedClass.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/DerivedClass.java Wed Aug 5 12:49:59 2009
@@ -27,7 +27,9 @@
this.body = body;
}
- public String getBody() {
- return body;
+ public String getAndClearBody() {
+ String answer = body;
+ body = null;
+ return answer;
}
}
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java?rev=801196&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java Wed Aug 5 12:49:59 2009
@@ -0,0 +1,38 @@
+/**
+ * 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.bean.issues;
+
+/**
+ * @version $Revision$
+ */
+public class MyMessage {
+
+ private String message;
+
+ public MyMessage(String message) {
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ @Override
+ public String toString() {
+ return message;
+ }
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageListener.java?rev=801196&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageListener.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageListener.java Wed Aug 5 12:49:59 2009
@@ -0,0 +1,26 @@
+/**
+ * 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.bean.issues;
+
+/**
+ * @version $Revision$
+ */
+public interface MyMessageListener {
+
+ void onMessage(MyMessage message);
+
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageToProcessorConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageToProcessorConverter.java?rev=801196&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageToProcessorConverter.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageToProcessorConverter.java Wed Aug 5 12:49:59 2009
@@ -0,0 +1,50 @@
+/**
+ * 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.bean.issues;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.NoTypeConversionAvailableException;
+import org.apache.camel.Processor;
+import org.apache.camel.TypeConverter;
+
+/**
+ * @version $Revision$
+ */
+public class MyMessageToProcessorConverter implements TypeConverter {
+
+ @SuppressWarnings("unchecked")
+ public <T> T convertTo(Class<T> type, Object value) {
+ return (T) new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Bye World");
+ }
+ };
+ }
+
+ public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
+ return convertTo(type, value);
+ }
+
+ public <T> T mandatoryConvertTo(Class<T> type, Object value) throws NoTypeConversionAvailableException {
+ return convertTo(type, value);
+ }
+
+ public <T> T mandatoryConvertTo(Class<T> type, Exchange exchange, Object value) throws NoTypeConversionAvailableException {
+ return convertTo(type, value);
+ }
+
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageToProcessorConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessageToProcessorConverter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BaseClass.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BaseClass.java?rev=801196&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BaseClass.java (added)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BaseClass.java Wed Aug 5 12:49:59 2009
@@ -0,0 +1,30 @@
+/**
+ * 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.itest.issues;
+
+import javax.jms.MessageListener;
+import javax.jms.Message;
+
+/**
+ * @version $Revision$
+ */
+public class BaseClass implements MessageListener {
+
+ public void onMessage(Message message) {
+ System.out.println("base called");
+ }
+}
Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BaseClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BaseClass.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java?rev=801196&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java (added)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java Wed Aug 5 12:49:59 2009
@@ -0,0 +1,41 @@
+/**
+ * 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.itest.issues;
+
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+
+/**
+ * @version $Revision$
+ */
+public class BeanCallDerivedClassTest extends CamelSpringTestSupport {
+
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml");
+ }
+
+ @Test
+ public void testCallBean() throws Exception {
+ DerivedClass derived = context.getRegistry().lookup("derived", DerivedClass.class);
+
+ template.sendBody("direct:start", "Hello World");
+ assertEquals("Hello World", derived.getBody());
+ }
+
+}
Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/BeanCallDerivedClassTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/DerivedClass.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/DerivedClass.java?rev=801196&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/DerivedClass.java (added)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/DerivedClass.java Wed Aug 5 12:49:59 2009
@@ -0,0 +1,33 @@
+/**
+ * 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.itest.issues;
+
+/**
+ * @version $Revision$
+ */
+public class DerivedClass extends BaseClass {
+
+ private String body;
+
+ public void process(String body) {
+ this.body = body;
+ }
+
+ public String getBody() {
+ return body;
+ }
+}
Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/DerivedClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/DerivedClass.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml?rev=801196&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml (added)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml Wed Aug 5 12:49:59 2009
@@ -0,0 +1,35 @@
+<?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.
+-->
+<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.5.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <bean id="derived" class="org.apache.camel.itest.issues.DerivedClass"/>
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:start"/>
+ <to uri="bean:derived?method=process"/>
+ </route>
+ </camelContext>
+
+</beans>
Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/issues/BeanCallDerivedClassTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml