You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2016/11/30 14:01:25 UTC
[06/16] james-project git commit: JAMES-1868 Add Spring support for
DropWizard
JAMES-1868 Add Spring support for DropWizard
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/61a319f8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/61a319f8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/61a319f8
Branch: refs/heads/master
Commit: 61a319f8c16edfc308b04e06b50fc4827740498b
Parents: 69769e0
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Nov 24 11:58:27 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Nov 30 16:31:07 2016 +0700
----------------------------------------------------------------------
.../resources/META-INF/spring/spring-mailbox.xml | 2 +-
.../META-INF/org/apache/james/spring-server.xml | 8 ++++++++
.../META-INF/spring/activemq-queue-context.xml | 19 ++++++++++---------
3 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/61a319f8/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
index 153e1a2..f681a0d 100644
--- a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
+++ b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
@@ -65,6 +65,6 @@
<beans profile="cassandra">
<import resource="classpath:META-INF/spring/mailbox-cassandra.xml"/>
<import resource="classpath:META-INF/spring/mailbox-elasticsearch.xml"/>
- <import resource="classpath:META-INF/spring/kafka.xml"/>
+ <!-- <import resource="classpath:META-INF/spring/kafka.xml"/> -->
</beans>
</beans>
http://git-wip-us.apache.org/repos/asf/james-project/blob/61a319f8/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
index 2175f47..658f1e9 100644
--- a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
+++ b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
@@ -285,6 +285,14 @@
<import resource="classpath:jetm-monitoring.conf" />
-->
+ <!--
+ ======================================================================
+ Metrics
+ ======================================================================
+ -->
+
+ <bean id="metricFactory" class="org.apache.james.metrics.dropwizard.DropWizardMetricFactory"/>
+
<beans profile="cassandra">
<import resource="classpath:META-INF/cassandra-session.xml"/>
http://git-wip-us.apache.org/repos/asf/james-project/blob/61a319f8/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml b/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
index 1545212..5c1b52c 100644
--- a/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
+++ b/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
@@ -18,21 +18,22 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:amq="http://activemq.apache.org/schema/core"
- xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-3.0.xsd">
<!-- James Mail Queue Factory -->
- <bean id="mailqueuefactory" class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory" depends-on="broker">
- <constructor-arg index="0" ref="jmsConnectionFactory"/>
- <constructor-arg index="1">
- <util:constant static-field="org.apache.james.queue.api.MailQueueItemDecoratorFactory.RAW_FACTORY"/>
- </constructor-arg>
- </bean>
+ <bean id="mailqueuefactory" class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory" depends-on="broker">
+ <constructor-arg index="0" ref="jmsConnectionFactory"/>
+ <constructor-arg index="1">
+ <util:constant static-field="org.apache.james.queue.api.MailQueueItemDecoratorFactory.RAW_FACTORY"/>
+ </constructor-arg>
+ <constructor-arg index="2" ref="metricFactory"/>
+ </bean>
<!--
ActiveMQ Broker, Connections, Blob
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org