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 ma...@apache.org on 2015/12/11 11:06:49 UTC
svn commit: r1719313 - in
/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules:
mailbox/ server/
Author: matthieu
Date: Fri Dec 11 10:06:49 2015
New Revision: 1719313
URL: http://svn.apache.org/viewvc?rev=1719313&view=rev
Log:
JAMES-1644 cleanup injection of Cassandra-guice
Removed:
james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/SimpleMessageSearchModule.java
Modified:
james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java
Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java?rev=1719313&r1=1719312&r2=1719313&view=diff
==============================================================================
--- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java (original)
+++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java Fri Dec 11 10:06:49 2015
@@ -31,15 +31,14 @@ import org.apache.james.mailbox.cassandr
import org.apache.james.mailbox.cassandra.CassandraSubscriptionManager;
import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider;
import org.apache.james.mailbox.cassandra.mail.CassandraUidProvider;
-import org.apache.james.mailbox.elasticsearch.events.ElasticSearchListeningMessageSearchIndex;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.NoMailboxPathLocker;
+import org.apache.james.mailbox.store.mail.MailboxMapperFactory;
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
import org.apache.james.mailbox.store.mail.ModSeqProvider;
import org.apache.james.mailbox.store.mail.UidProvider;
-import org.apache.james.mailbox.store.search.MessageSearchIndex;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
@@ -53,7 +52,11 @@ public class CassandraMailboxModule exte
@Override
protected void configure() {
- bind(new TypeLiteral<MessageSearchIndex<CassandraId>>(){}).to(new TypeLiteral<ElasticSearchListeningMessageSearchIndex<CassandraId>>(){});
+ bind(new TypeLiteral<MessageMapperFactory<CassandraId>>(){}).to(CassandraMailboxSessionMapperFactory.class);
+ bind(new TypeLiteral<MailboxMapperFactory<CassandraId>>(){}).to(CassandraMailboxSessionMapperFactory.class);
+ bind(new TypeLiteral<MailboxSessionMapperFactory<CassandraId>>(){}).to(CassandraMailboxSessionMapperFactory.class);
+ bind(new TypeLiteral<ModSeqProvider<CassandraId>>(){}).to(new TypeLiteral<CassandraModSeqProvider>(){});
+ bind(new TypeLiteral<UidProvider<CassandraId>>(){}).to(new TypeLiteral<CassandraUidProvider>(){});
bind(SubscriptionManager.class).to(CassandraSubscriptionManager.class);
bind(new TypeLiteral<MessageMapperFactory<CassandraId>>(){}).to(CassandraMailboxSessionMapperFactory.class);
Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java?rev=1719313&r1=1719312&r2=1719313&view=diff
==============================================================================
--- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java (original)
+++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java Fri Dec 11 10:06:49 2015
@@ -46,8 +46,6 @@ public class ElasticSearchMailboxModule
protected void configure() {
bind(new TypeLiteral<MessageSearchIndex<CassandraId>>(){}).to(new TypeLiteral<ElasticSearchListeningMessageSearchIndex<CassandraId>>() {});
bind(TextExtractor.class).to(TikaTextExtractor.class);
- bind(new TypeLiteral<MessageSearchIndex<CassandraId>>() {})
- .to(new TypeLiteral<ElasticSearchListeningMessageSearchIndex<CassandraId>>() {});
}
@Provides
Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java?rev=1719313&r1=1719312&r2=1719313&view=diff
==============================================================================
--- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java (original)
+++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java Fri Dec 11 10:06:49 2015
@@ -50,7 +50,7 @@ public class CamelMailetContainerModule
@Override
protected void configure() {
- bind(MailProcessor.class).to(CamelCompositeProcessor.class);
+ bind(MailProcessor.class).to(CamelCompositeProcessor.class).in(Singleton.class);
bind(MailSpoolerMBean.class).to(JamesMailSpooler.class);
bind(MailetLoader.class).to(GuiceMailetLoader.class);
bind(MatcherLoader.class).to(GuiceMatcherLoader.class);
Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java?rev=1719313&r1=1719312&r2=1719313&view=diff
==============================================================================
--- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java (original)
+++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/EmbeddedActiveMQ.java Fri Dec 11 10:06:49 2015
@@ -19,9 +19,9 @@
package org.apache.james.modules.server;
-import com.google.common.base.Throwables;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.annotation.PreDestroy;
+import javax.jms.ConnectionFactory;
+
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQPrefetchPolicy;
import org.apache.activemq.blob.BlobTransferPolicy;
@@ -30,10 +30,12 @@ import org.apache.activemq.broker.Broker
import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.plugin.StatisticsBrokerPlugin;
import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.queue.activemq.FileSystemBlobTransferPolicy;
-import javax.annotation.PreDestroy;
-import javax.jms.ConnectionFactory;
+import com.google.common.base.Throwables;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
@Singleton
public class EmbeddedActiveMQ {
@@ -41,13 +43,13 @@ public class EmbeddedActiveMQ {
private ActiveMQConnectionFactory activeMQConnectionFactory;
private BrokerService brokerService;
- @Inject private EmbeddedActiveMQ() {
+ @Inject private EmbeddedActiveMQ(FileSystem fileSystem) {
try {
launchEmbeddedBroker();
} catch (Exception e) {
throw Throwables.propagate(e);
}
- activeMQConnectionFactory = createActiveMQConnectionFactory(createBlobTransferPolicy());
+ activeMQConnectionFactory = createActiveMQConnectionFactory(createBlobTransferPolicy(fileSystem));
}
public ConnectionFactory getConnectionFactory() {
@@ -73,9 +75,10 @@ public class EmbeddedActiveMQ {
return prefetchPolicy;
}
- private BlobTransferPolicy createBlobTransferPolicy() {
- BlobTransferPolicy blobTransferPolicy = new FileSystemBlobTransferPolicy();
+ private BlobTransferPolicy createBlobTransferPolicy(FileSystem fileSystem) {
+ FileSystemBlobTransferPolicy blobTransferPolicy = new FileSystemBlobTransferPolicy();
blobTransferPolicy.setDefaultUploadUrl("file://var/store/activemq/blob-transfer");
+ blobTransferPolicy.setFileSystem(fileSystem);
return blobTransferPolicy;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org