Permalink
Browse files

added fix for CAMEL-1136 to enable the camel-test module so folks can…

… derive from CamelTestSupport

git-svn-id: https://svn.apache.org/repos/asf/activemq/camel/trunk@722199 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent b7820ba commit d0c6e30f682514199bc6dd63510de9b76a1daaa8 @jstrachan jstrachan committed Dec 1, 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
* {@link Endpoint} and
* {@link 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
* {@link org.apache.camel.Consume} and {@link org.apache.camel.MessageDriven} annotations along with
* <a href="http://activemq.apache.org/camel/pojo-producing.html">POJO Producing</a> via the
* {@link org.apache.camel.Produce} annotation along with other annotations such as
* {@link 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 &lt;camelContext&gt; element in your <a href="http://activemq.apache.org/camel/spring.html">Spring XML</a>
+ * If you use the &lt;camelContext&gt; 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 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
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
View
@@ -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>

0 comments on commit d0c6e30

Please sign in to comment.