You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/03/07 04:35:50 UTC
svn commit: r919918 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/processor/
components/camel-spring/src/main/java/org/apache/camel/spring/
components/camel-spring/src/main/java/org/apache/camel/spring/handler/
components/camel-spring/sr...
Author: ningjiang
Date: Sun Mar 7 03:35:50 2010
New Revision: 919918
URL: http://svn.apache.org/viewvc?rev=919918&view=rev
Log:
Fixed the unit test error of camel-spring
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=919918&r1=919917&r2=919918&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Sun Mar 7 03:35:50 2010
@@ -112,7 +112,7 @@
}
public MulticastProcessor(CamelContext camelContext, Collection<Processor> processors, AggregationStrategy aggregationStrategy) {
- this(camelContext,processors, aggregationStrategy, false, null, false, false);
+ this(camelContext, processors, aggregationStrategy, false, null, false, false);
}
public MulticastProcessor(CamelContext camelContext, Collection<Processor> processors, AggregationStrategy aggregationStrategy,
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=919918&r1=919917&r2=919918&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Sun Mar 7 03:35:50 2010
@@ -560,7 +560,7 @@
getContext().setManagementStrategy(new DefaultManagementStrategy());
} else if (camelJMXAgent != null) {
LOG.info("JMXAgent enabled: " + camelJMXAgent);
- DefaultManagementAgent agent = new DefaultManagementAgent();
+ DefaultManagementAgent agent = new DefaultManagementAgent(getContext());
agent.setConnectorPort(parseInteger(camelJMXAgent.getConnectorPort()));
agent.setCreateConnector(parseBoolean(camelJMXAgent.getCreateConnector()));
agent.setMBeanObjectDomainName(parseText(camelJMXAgent.getMbeanObjectDomainName()));
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=919918&r1=919917&r2=919918&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Sun Mar 7 03:35:50 2010
@@ -26,7 +26,6 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
-import org.apache.camel.spring.CamelExecutorServiceFactoryBean;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -40,6 +39,7 @@
import org.apache.camel.spring.CamelConsumerTemplateFactoryBean;
import org.apache.camel.spring.CamelContextFactoryBean;
import org.apache.camel.spring.CamelEndpointFactoryBean;
+import org.apache.camel.spring.CamelExecutorServiceFactoryBean;
import org.apache.camel.spring.CamelJMXAgentDefinition;
import org.apache.camel.spring.CamelProducerTemplateFactoryBean;
import org.apache.camel.spring.CamelPropertyPlaceholderDefinition;
@@ -57,7 +57,6 @@
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.beans.factory.xml.ParserContext;
-
/**
* Camel namespace for the spring XML configuration file.
*/
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml?rev=919918&r1=919917&r2=919918&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml Sun Mar 7 03:35:50 2010
@@ -25,10 +25,12 @@
<!-- START SNIPPET: example -->
<bean id="agent" class="org.apache.camel.management.DefaultManagementAgent">
<property name="MBeanServer" ref="mbeanServer"/>
+ <!-- From Camel 2.3.0, you need to set the camelContext property of DefaultManagementAgent -->
+ <property name="camelContext" ref="camel" />
</bean>
<bean id="managementStrategy" class="org.apache.camel.management.ManagedManagementStrategy">
- <property name="managementAgent" ref="agent"/>
+ <constructor-arg index="0"><ref bean="agent"/></constructor-arg>
</bean>
<bean id="lifeCycleStrategy" class="org.apache.camel.management.DefaultManagementLifecycleStrategy">