Author: jstrachan
Date: Mon Dec 1 11:49:08 2008
New Revision: 722199
URL: http://svn.apache.org/viewvc?rev=722199&view=rev
Log:
added fix for CAMEL-1136 to enable the camel-test module so folks can derive
from CamelTestSupport
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
activemq/camel/trunk/components/pom.xml
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java?rev=722199&r1=722198&r2=722199&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
Mon Dec 1 11:49:08 2008
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
@@ -44,13 +45,13 @@
* features in Camel such as the <a
href="http://activemq.apache.org/camel/bean-injection.html";>Bean Injection</a>
of objects like
* [EMAIL PROTECTED] Endpoint} and
* [EMAIL PROTECTED] org.apache.camel.ProducerTemplate} together with support
for
- * <a href="http://activemq.apache.org/camel/pojo-consuming.html";>POJO
Consuming</a> via the
+ * <a href="http://activemq.apache.org/camel/pojo-consuming.html";>POJO
Consuming</a> via the
* [EMAIL PROTECTED] org.apache.camel.Consume} and [EMAIL PROTECTED]
org.apache.camel.MessageDriven} annotations along with
* <a href="http://activemq.apache.org/camel/pojo-producing.html";>POJO
Producing</a> via the
* [EMAIL PROTECTED] org.apache.camel.Produce} annotation along with other
annotations such as
* [EMAIL PROTECTED] org.apache.camel.RecipientList} for creating <a
href="http://activemq.apache.org/camel/recipientlist-annotation.html";>a
Recipient List router via annotations</a>.
* <p>
- * If you use the <camelContext> element in your <a
href="http://activemq.apache.org/camel/spring.html";>Spring XML</a>
+ * If you use the <camelContext> element in your <a
href="http://activemq.apache.org/camel/spring.html";>Spring XML</a>
* then one of these bean post processors is implicity installed and
configured for you. So you should never have to
* explicitly create or configure one of these instances.
*
@@ -61,7 +62,7 @@
public class CamelBeanPostProcessor implements BeanPostProcessor,
ApplicationContextAware {
private static final transient Log LOG =
LogFactory.getLog(CamelBeanPostProcessor.class);
@XmlTransient
- private SpringCamelContext camelContext;
+ private CamelContext camelContext;
@XmlTransient
private ApplicationContext applicationContext;
@XmlTransient
@@ -95,11 +96,11 @@
this.applicationContext = applicationContext;
}
- public SpringCamelContext getCamelContext() {
+ public CamelContext getCamelContext() {
return camelContext;
}
- public void setCamelContext(SpringCamelContext camelContext) {
+ public void setCamelContext(CamelContext camelContext) {
this.camelContext = camelContext;
postProcessor = new CamelPostProcessorHelper(camelContext) {
@Override
Modified: activemq/camel/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=722199&r1=722198&r2=722199&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Mon Dec 1 11:49:08 2008
@@ -77,11 +77,13 @@
<module>camel-script</module>
<module>camel-spring</module>
<module>camel-spring-integration</module>
+ <module>camel-spring-javaconfig</module>
<module>camel-sql</module>
<module>camel-stringtemplate</module>
<module>camel-stream</module>
<!--<module>camel-supercsv</module>-->
<module>camel-swing</module>
+ <module>camel-test</module>
<module>camel-uface</module>
<module>camel-velocity</module>
<module>camel-xmlbeans</module>
