Repository: james-project Updated Branches: refs/heads/master 4097e0933 -> 6e153c4c3
JAMES-1772 Optimize camel startup Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3bb17771 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3bb17771 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3bb17771 Branch: refs/heads/master Commit: 3bb177716b21daa0e1b2153653906d575cec8e62 Parents: f7f01be Author: Matthieu Baechler <[email protected]> Authored: Wed Jun 8 11:27:50 2016 +0200 Committer: Raphael Ouazana <[email protected]> Committed: Tue Jun 21 10:36:00 2016 +0200 ---------------------------------------------------------------------- .../james/modules/server/CamelMailetContainerModule.java | 8 ++++++-- server/pom.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3bb17771/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java index 0240adf..1decdd6 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java @@ -24,6 +24,7 @@ import java.util.Optional; import java.util.Set; import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.impl.SimpleRegistry; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; @@ -36,8 +37,8 @@ import org.apache.james.mailetcontainer.impl.JamesMailSpooler; import org.apache.james.mailetcontainer.impl.JamesMailetContext; import org.apache.james.mailetcontainer.impl.MatcherMailetPair; import org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor; -import org.apache.james.queue.api.MailQueueFactory; import org.apache.james.mailetcontainer.impl.camel.CamelMailetProcessor; +import org.apache.james.queue.api.MailQueueFactory; import org.apache.james.user.api.UsersRepository; import org.apache.james.utils.ConfigurationPerformer; import org.apache.james.utils.ConfigurationProvider; @@ -119,8 +120,11 @@ public class CamelMailetContainerModule extends AbstractModule { @Override public void initModule() { try { + DefaultCamelContext camelContext = new DefaultCamelContext(); + camelContext.disableJMX(); + camelContext.setRegistry(new SimpleRegistry()); camelCompositeProcessor.setLog(CAMEL_LOGGER); - camelCompositeProcessor.setCamelContext(new DefaultCamelContext()); + camelCompositeProcessor.setCamelContext(camelContext); camelCompositeProcessor.configure(configurationProvider.getConfiguration("mailetcontainer").configurationAt("processors")); camelCompositeProcessor.init(); checkProcessors(); http://git-wip-us.apache.org/repos/asf/james-project/blob/3bb17771/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 3d3dc98..b59d2a0 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -117,7 +117,7 @@ <productName>Apache-James Mail Server</productName> <activemq.version>5.7.0</activemq.version> - <camel.version>2.10.3</camel.version> + <camel.version>2.13.4</camel.version> <derby.version>10.9.1.0</derby.version> <hadoop.version>1.1.1</hadoop.version> <hbase.version>0.94.27</hbase.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
