JAMES-1693 implement a data memory module for Guice
That means have a tree of guice modules to pick from
when composing an application.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/517a4cfe
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/517a4cfe
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/517a4cfe
Branch: refs/heads/master
Commit: 517a4cfe725be483541c2fc7ce59f74edef62d45
Parents: 3413ec5
Author: Matthieu Baechler <matthieu.baech...@linagora.com>
Authored: Mon Mar 21 11:32:15 2016 +0100
Committer: Matthieu Baechler <matthieu.baech...@linagora.com>
Committed: Wed Mar 23 17:07:13 2016 +0100
----------------------------------------------------------------------
.../inmemory/InMemoryMailboxManager.java | 8 +-
.../inmemory/InMemoryMailboxManagerTest.java | 3 +-
.../manager/InMemoryIntegrationResources.java | 3 +
.../mailbox/store/StoreSubscriptionManager.java | 5 +-
.../inmemory/host/InMemoryHostSystem.java | 4 +-
mpt/impl/smtp/cassandra/pom.xml | 6 +
.../apache/james/mpt/smtp/SmtpTestModule.java | 15 +-
.../src/test/resources/mailetcontainer.xml | 3 +
mpt/pom.xml | 6 +
server/container/cassandra-guice/README.adoc | 45 -
server/container/cassandra-guice/pom.xml | 471 ------
.../sample-configuration/cassandra.properties | 6 -
.../sample-configuration/dnsservice.xml | 29 -
.../sample-configuration/domainlist.xml | 28 -
.../elasticsearch.properties | 26 -
.../sample-configuration/imapserver.xml | 54 -
.../sample-configuration/jcr-repository.xml | 72 -
.../sample-configuration/jmap.properties | 11 -
.../sample-configuration/jmx.properties | 28 -
.../sample-configuration/lmtpserver.xml | 41 -
.../sample-configuration/mailetcontainer.xml | 137 --
.../mailrepositorystore.xml | 34 -
.../sample-configuration/pop3server.xml | 42 -
.../recipientrewritetable.xml | 27 -
.../sample-configuration/smtpserver.xml | 105 --
.../sample-configuration/usersrepository.xml | 27 -
.../org/apache/james/CassandraJamesServer.java | 65 -
.../apache/james/CassandraJamesServerMain.java | 82 --
.../org/apache/james/jmap/JMAPCommonModule.java | 70 -
.../java/org/apache/james/jmap/JMAPModule.java | 120 --
.../org/apache/james/jmap/MethodsModule.java | 65 -
.../james/modules/CommonServicesModule.java | 63 -
.../modules/data/CassandraDomainListModule.java | 65 -
.../CassandraRecipientRewriteTableModule.java | 68 -
.../data/CassandraUsersRepositoryModule.java | 38 -
.../modules/mailbox/CassandraMailboxModule.java | 83 --
.../modules/mailbox/CassandraSessionModule.java | 99 --
.../mailbox/ElasticSearchMailboxModule.java | 81 --
.../ScheduledExecutorServiceProvider.java | 49 -
.../modules/protocols/IMAPServerModule.java | 103 --
.../modules/protocols/JMAPServerModule.java | 67 -
.../modules/protocols/LMTPServerModule.java | 62 -
.../protocols/ManageSieveServerModule.java | 62 -
.../modules/protocols/POP3ServerModule.java | 62 -
.../protocols/ProtocolHandlerModule.java | 34 -
.../modules/protocols/SMTPServerModule.java | 68 -
.../modules/server/ActiveMQQueueModule.java | 60 -
.../server/CamelMailetContainerModule.java | 111 --
.../server/ConfigurationProviderModule.java | 33 -
.../james/modules/server/DNSServiceModule.java | 62 -
.../james/modules/server/EmbeddedActiveMQ.java | 107 --
.../apache/james/modules/server/JMXServer.java | 125 --
.../james/modules/server/JMXServerModule.java | 114 --
.../server/MailStoreRepositoryModule.java | 91 --
.../james/modules/server/QuotaModule.java | 38 -
.../james/modules/server/SieveModule.java | 37 -
.../james/utils/ConfigurationPerformer.java | 27 -
.../james/utils/ConfigurationProvider.java | 30 -
.../james/utils/ConfigurationsPerformer.java | 41 -
.../apache/james/utils/ExtendedServerProbe.java | 40 -
.../james/utils/FileConfigurationProvider.java | 90 --
.../apache/james/utils/GuiceGenericLoader.java | 47 -
.../utils/GuiceMailboxManagerResolver.java | 59 -
.../apache/james/utils/GuiceMailetLoader.java | 52 -
.../apache/james/utils/GuiceMatcherLoader.java | 52 -
.../james/utils/GuiceProtocolHandlerLoader.java | 60 -
.../apache/james/utils/GuiceServerProbe.java | 344 -----
.../utils/InMemoryMailRepositoryStore.java | 164 ---
.../james/utils/MailRepositoryProvider.java | 29 -
.../james/utils/MailboxManagerDefinition.java | 57 -
.../apache/james/utils/PropertiesReader.java | 43 -
.../apache/james/CassandraJamesServerTest.java | 157 --
.../james/modules/TestElasticSearchModule.java | 52 -
.../james/modules/TestFilesystemModule.java | 61 -
.../james/modules/TestJMAPServerModule.java | 68 -
.../utils/FileConfigurationProviderTest.java | 119 --
.../utils/InMemoryMailRepositoryStoreTest.java | 109 --
.../apache/james/utils/PropertiesReadTest.java | 44 -
.../src/test/resources/dnsservice.xml | 29 -
.../test/resources/fakemailrepositorystore.xml | 31 -
.../src/test/resources/imapserver.xml | 54 -
.../cassandra-guice/src/test/resources/keystore | Bin 2245 -> 0 bytes
.../src/test/resources/lmtpserver.xml | 41 -
.../src/test/resources/mailetcontainer.xml | 168 ---
.../src/test/resources/mailrepositorystore.xml | 31 -
.../src/test/resources/managesieveserver.xml | 65 -
.../src/test/resources/pop3server.xml | 42 -
.../src/test/resources/smtpserver.xml | 105 --
.../src/test/resources/test.properties | 6 -
.../cassandra-guice/src/test/resources/test.xml | 28 -
.../container/guice/cassandra-guice/README.adoc | 45 +
server/container/guice/cassandra-guice/pom.xml | 291 ++++
.../apache/james/CassandraJamesServerMain.java | 58 +
.../modules/data/CassandraDomainListModule.java | 65 +
.../CassandraRecipientRewriteTableModule.java | 68 +
.../data/CassandraUsersRepositoryModule.java | 38 +
.../modules/mailbox/CassandraMailboxModule.java | 97 ++
.../modules/mailbox/CassandraSessionModule.java | 99 ++
.../mailbox/ElasticSearchMailboxModule.java | 81 ++
.../ScheduledExecutorServiceProvider.java | 49 +
.../apache/james/CassandraJamesServerTest.java | 71 +
.../james/modules/TestElasticSearchModule.java | 52 +
.../src/test/resources/dnsservice.xml | 29 +
.../test/resources/fakemailrepositorystore.xml | 31 +
.../src/test/resources/imapserver.xml | 54 +
.../cassandra-guice/src/test/resources/keystore | Bin 0 -> 2245 bytes
.../src/test/resources/lmtpserver.xml | 41 +
.../src/test/resources/mailetcontainer.xml | 168 +++
.../src/test/resources/mailrepositorystore.xml | 31 +
.../src/test/resources/managesieveserver.xml | 65 +
.../src/test/resources/pop3server.xml | 42 +
.../src/test/resources/smtpserver.xml | 105 ++
server/container/guice/guice-common/pom.xml | 291 ++++
.../sample-configuration/cassandra.properties | 6 +
.../sample-configuration/dnsservice.xml | 29 +
.../sample-configuration/domainlist.xml | 28 +
.../elasticsearch.properties | 26 +
.../sample-configuration/imapserver.xml | 54 +
.../sample-configuration/jcr-repository.xml | 72 +
.../sample-configuration/jmap.properties | 11 +
.../sample-configuration/jmx.properties | 28 +
.../sample-configuration/lmtpserver.xml | 41 +
.../sample-configuration/mailetcontainer.xml | 137 ++
.../mailrepositorystore.xml | 34 +
.../sample-configuration/pop3server.xml | 42 +
.../recipientrewritetable.xml | 27 +
.../sample-configuration/smtpserver.xml | 105 ++
.../sample-configuration/usersrepository.xml | 27 +
.../java/org/apache/james/GuiceJamesServer.java | 94 ++
.../org/apache/james/jmap/JMAPCommonModule.java | 70 +
.../java/org/apache/james/jmap/JMAPModule.java | 127 ++
.../org/apache/james/jmap/MethodsModule.java | 74 +
.../james/modules/CommonServicesModule.java | 79 +
.../james/modules/MailetProcessingModule.java | 36 +
.../java/org/apache/james/modules/Names.java | 24 +
.../apache/james/modules/ProtocolsModule.java | 52 +
.../modules/protocols/IMAPServerModule.java | 103 ++
.../modules/protocols/JMAPServerModule.java | 75 +
.../modules/protocols/LMTPServerModule.java | 62 +
.../protocols/ManageSieveServerModule.java | 63 +
.../modules/protocols/POP3ServerModule.java | 62 +
.../protocols/ProtocolHandlerModule.java | 34 +
.../modules/protocols/SMTPServerModule.java | 68 +
.../modules/server/ActiveMQQueueModule.java | 68 +
.../server/CamelMailetContainerModule.java | 111 ++
.../server/ConfigurationProviderModule.java | 33 +
.../james/modules/server/DNSServiceModule.java | 62 +
.../james/modules/server/EmbeddedActiveMQ.java | 107 ++
.../apache/james/modules/server/JMXServer.java | 125 ++
.../james/modules/server/JMXServerModule.java | 103 ++
.../server/MailStoreRepositoryModule.java | 91 ++
.../james/modules/server/QuotaModule.java | 38 +
.../james/modules/server/SieveModule.java | 37 +
.../james/utils/ConfigurationPerformer.java | 27 +
.../james/utils/ConfigurationProvider.java | 30 +
.../james/utils/ConfigurationsPerformer.java | 41 +
.../apache/james/utils/ExtendedServerProbe.java | 40 +
.../james/utils/FileConfigurationProvider.java | 90 ++
.../apache/james/utils/GuiceGenericLoader.java | 47 +
.../apache/james/utils/GuiceGenericType.java | 40 +
.../utils/GuiceMailboxManagerResolver.java | 59 +
.../apache/james/utils/GuiceMailetLoader.java | 53 +
.../apache/james/utils/GuiceMatcherLoader.java | 53 +
.../james/utils/GuiceProtocolHandlerLoader.java | 61 +
.../apache/james/utils/GuiceServerProbe.java | 344 +++++
.../utils/InMemoryMailRepositoryStore.java | 164 +++
.../james/utils/MailRepositoryProvider.java | 29 +
.../james/utils/MailboxManagerDefinition.java | 57 +
.../apache/james/utils/PropertiesReader.java | 43 +
.../apache/james/AbstractJamesServerTest.java | 117 ++
.../james/modules/TestFilesystemModule.java | 61 +
.../james/modules/TestJMAPServerModule.java | 68 +
.../utils/FileConfigurationProviderTest.java | 119 ++
.../utils/InMemoryMailRepositoryStoreTest.java | 109 ++
.../apache/james/utils/PropertiesReadTest.java | 44 +
.../test/resources/fakemailrepositorystore.xml | 31 +
.../src/test/resources/mailrepositorystore.xml | 31 +
.../src/test/resources/test.properties | 6 +
.../guice-common/src/test/resources/test.xml | 28 +
server/container/guice/memory-guice/README.adoc | 38 +
server/container/guice/memory-guice/pom.xml | 261 ++++
.../org/apache/james/MemoryJamesServerMain.java | 49 +
.../james/modules/data/MemoryDataModule.java | 76 +
.../modules/mailbox/MemoryMailboxModule.java | 101 ++
.../org/apache/james/MemoryJamesServerTest.java | 44 +
.../src/test/resources/dnsservice.xml | 29 +
.../src/test/resources/imapserver.xml | 54 +
.../memory-guice/src/test/resources/keystore | Bin 0 -> 2245 bytes
.../src/test/resources/lmtpserver.xml | 41 +
.../src/test/resources/mailetcontainer.xml | 168 +++
.../src/test/resources/mailrepositorystore.xml | 31 +
.../src/test/resources/managesieveserver.xml | 65 +
.../src/test/resources/pop3server.xml | 42 +
.../src/test/resources/smtpserver.xml | 105 ++
server/data/data-memory/pom.xml | 6 +
server/pom.xml | 41 +-
.../cassandra-jmap-integration-testing/pom.xml | 255 ++++
.../CassandraGetMailboxesMethodTest.java | 53 +
.../CassandraGetMessageListMethodTest.java | 57 +
.../CassandraGetMessagesMethodTest.java | 57 +
.../CassandraJmapAuthenticationTest.java | 55 +
.../CassandraSetMessagesMethodTest.java | 57 +
.../jmap/servers/CassandraJmapServerModule.java | 64 +
.../src/test/resources/dnsservice.xml | 29 +
.../src/test/resources/imapserver.xml | 54 +
.../src/test/resources/keystore | Bin 0 -> 2245 bytes
.../src/test/resources/lmtpserver.xml | 41 +
.../src/test/resources/mailetcontainer.xml | 103 ++
.../src/test/resources/mailrepositorystore.xml | 31 +
.../src/test/resources/pop3server.xml | 42 +
.../src/test/resources/smtpserver.xml | 105 ++
.../jmap-integration-testing-common/pom.xml | 241 +++
.../org/apache/james/jmap/ContainerTest.java | 45 +
.../jmap/FixedDateZonedDateTimeProvider.java | 39 +
.../james/jmap/JMAPAuthenticationTest.java | 474 ++++++
.../apache/james/jmap/JmapAuthentication.java | 55 +
.../org/apache/james/jmap/UserCredentials.java | 66 +
.../integration/GetMailboxesMethodTest.java | 421 ++++++
.../integration/GetMessageListMethodTest.java | 511 +++++++
.../integration/GetMessagesMethodTest.java | 334 +++++
.../integration/SetMessagesMethodTest.java | 1367 +++++++++++++++++
.../memory-jmap-integration-testing/pom.xml | 221 +++
.../memory/MemoryGetMailboxesMethodTest.java | 44 +
.../memory/MemoryGetMessageListMethodTest.java | 48 +
.../memory/MemoryGetMessagesMethodTest.java | 48 +
.../memory/MemoryJmapAuthenticationTest.java | 46 +
.../memory/MemorySetMessagesMethodTest.java | 47 +
.../jmap/servers/MemoryJmapServerModule.java | 43 +
.../src/test/resources/dnsservice.xml | 29 +
.../src/test/resources/imapserver.xml | 54 +
.../src/test/resources/keystore | Bin 0 -> 2245 bytes
.../src/test/resources/lmtpserver.xml | 41 +
.../src/test/resources/mailetcontainer.xml | 103 ++
.../src/test/resources/mailrepositorystore.xml | 31 +
.../src/test/resources/managesieveserver.xml | 65 +
.../src/test/resources/pop3server.xml | 42 +
.../src/test/resources/smtpserver.xml | 105 ++
.../protocols/jmap-integration-testing/pom.xml | 269 ----
.../jmap/CassandraJmapAuthenticationTest.java | 39 -
.../org/apache/james/jmap/ContainerTest.java | 46 -
.../jmap/FixedDateZonedDateTimeProvider.java | 39 -
.../james/jmap/JMAPAuthenticationTest.java | 478 ------
.../apache/james/jmap/JmapAuthentication.java | 55 -
.../java/org/apache/james/jmap/JmapServer.java | 31 -
.../org/apache/james/jmap/UserCredentials.java | 66 -
.../jmap/cassandra/CassandraJmapServer.java | 109 --
.../jmap/methods/GetMailboxesMethodTest.java | 429 ------
.../jmap/methods/GetMessageListMethodTest.java | 516 -------
.../jmap/methods/GetMessagesMethodTest.java | 339 -----
.../jmap/methods/SetMessagesMethodTest.java | 1372 ------------------
.../CassandraGetMailboxesMethodTest.java | 35 -
.../CassandraGetMessageListMethodTest.java | 35 -
.../CassandraGetMessagesMethodTest.java | 35 -
.../CassandraSetMessagesMethodTest.java | 35 -
.../src/test/resources/dnsservice.xml | 29 -
.../test/resources/fakemailrepositorystore.xml | 31 -
.../src/test/resources/imapserver.xml | 54 -
.../src/test/resources/keystore | Bin 2245 -> 0 bytes
.../src/test/resources/lmtpserver.xml | 41 -
.../src/test/resources/mailetcontainer.xml | 103 --
.../src/test/resources/mailrepositorystore.xml | 31 -
.../src/test/resources/pop3server.xml | 42 -
.../src/test/resources/smtpserver.xml | 105 --
.../src/test/resources/test.properties | 6 -
.../src/test/resources/test.xml | 28 -
265 files changed, 12842 insertions(+), 10123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
----------------------------------------------------------------------
diff --git
a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
index 1814766..a1683c9 100644
---
a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
+++
b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
@@ -20,24 +20,26 @@
package org.apache.james.mailbox.inmemory;
import java.util.List;
+import javax.inject.Inject;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.acl.MailboxACLResolver;
import org.apache.james.mailbox.store.Authenticator;
+import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.StoreMailboxManager;
import com.google.common.collect.Lists;
public class InMemoryMailboxManager extends StoreMailboxManager<InMemoryId> {
- public InMemoryMailboxManager(Authenticator authenticator,
MailboxPathLocker locker, MailboxACLResolver aclResolver,
GroupMembershipResolver groupMembershipResolver) {
- super(new InMemoryMailboxSessionMapperFactory(), authenticator,
locker, aclResolver, groupMembershipResolver);
+ @Inject
+ public InMemoryMailboxManager(MailboxSessionMapperFactory<InMemoryId>
mailboxSessionMapperFactory, Authenticator authenticator, MailboxPathLocker
locker, MailboxACLResolver aclResolver, GroupMembershipResolver
groupMembershipResolver) {
+ super(mailboxSessionMapperFactory, authenticator, locker, aclResolver,
groupMembershipResolver);
}
@Override
public List<Capabilities> getSupportedCapabilities() {
return Lists.newArrayList(Capabilities.Basic, Capabilities.Move);
-
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
----------------------------------------------------------------------
diff --git
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
index f960885..d3c6cf0 100644
---
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
+++
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
@@ -83,7 +83,8 @@ public class InMemoryMailboxManagerTest extends
AbstractMailboxManagerTest {
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
- StoreMailboxManager<InMemoryId> mailboxManager = new
InMemoryMailboxManager(new MockAuthenticator(), new JVMMailboxPathLocker(),
aclResolver, groupMembershipResolver);
+ InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new
InMemoryMailboxSessionMapperFactory();
+ StoreMailboxManager<InMemoryId> mailboxManager = new
InMemoryMailboxManager(mailboxSessionMapperFactory, new MockAuthenticator(),
new JVMMailboxPathLocker(), aclResolver, groupMembershipResolver);
mailboxManager.init();
setMailboxManager(mailboxManager);
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
----------------------------------------------------------------------
diff --git
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
index a1d5104..52fe81d 100644
---
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
+++
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
@@ -26,6 +26,7 @@ import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
+import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager;
import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
import org.apache.james.mailbox.manager.IntegrationResources;
@@ -50,7 +51,9 @@ public class InMemoryIntegrationResources implements
IntegrationResources {
public MailboxManager createMailboxManager(GroupMembershipResolver
groupMembershipResolver) throws MailboxException {
MockAuthenticator mockAuthenticator = new MockAuthenticator();
mockAuthenticator.addUser(ManagerTestResources.USER,
ManagerTestResources.USER_PASS);
+ InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new
InMemoryMailboxSessionMapperFactory();
final StoreMailboxManager<InMemoryId> manager = new
InMemoryMailboxManager(
+ mailboxSessionMapperFactory,
mockAuthenticator,
new NoMailboxPathLocker(),
new UnionMailboxACLResolver(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
----------------------------------------------------------------------
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
index 9fac23a..e611536 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
@@ -22,6 +22,8 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.RequestAware;
import org.apache.james.mailbox.SubscriptionManager;
@@ -41,7 +43,8 @@ public class StoreSubscriptionManager implements
SubscriptionManager {
private static final int INITIAL_SIZE = 32;
protected SubscriptionMapperFactory mapperFactory;
-
+
+ @Inject
public StoreSubscriptionManager(SubscriptionMapperFactory mapperFactory) {
this.mapperFactory = mapperFactory;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
----------------------------------------------------------------------
diff --git
a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
index 9c3e427..63f20d1 100644
---
a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
+++
b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
@@ -30,6 +30,7 @@ import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
+import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager;
import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
@@ -79,7 +80,8 @@ public class InMemoryHostSystem extends JamesImapHostSystem {
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
- mailboxManager = new InMemoryMailboxManager(userManager, new
JVMMailboxPathLocker(), aclResolver, groupMembershipResolver);
+ InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new
InMemoryMailboxSessionMapperFactory();
+ mailboxManager = new
InMemoryMailboxManager(mailboxSessionMapperFactory, userManager, new
JVMMailboxPathLocker(), aclResolver, groupMembershipResolver);
QuotaRootResolver quotaRootResolver = new
DefaultQuotaRootResolver(mailboxManager.getMapperFactory());
InMemoryPerUserMaxQuotaManager perUserMaxQuotaManager = new
InMemoryPerUserMaxQuotaManager();
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index e553987..ab2e539 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -159,6 +159,12 @@
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice-common</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java
----------------------------------------------------------------------
diff --git
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java
index 6a0203d..317fc71 100644
---
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java
+++
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTestModule.java
@@ -31,6 +31,9 @@ import
org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
import org.apache.james.mailbox.cassandra.modules.CassandraMessageModule;
import org.apache.james.mailbox.elasticsearch.ClientProvider;
import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
+import org.apache.james.modules.CommonServicesModule;
+import org.apache.james.modules.MailetProcessingModule;
+import org.apache.james.modules.ProtocolsModule;
import org.apache.james.modules.TestFilesystemModule;
import org.apache.james.mpt.api.SmtpHostSystem;
import org.apache.james.mpt.smtp.dns.InMemoryDNSService;
@@ -85,13 +88,17 @@ public class SmtpTestModule extends AbstractModule {
.build());
};
- install(Modules.override(CassandraJamesServerMain.defaultModule)
- .with(Modules.combine(
- new TestFilesystemModule(folder),
+ install(Modules
+ .override(
+ CassandraJamesServerMain.cassandraServerModule,
+ new
CommonServicesModule<>(CassandraJamesServerMain.cassandraId),
+ new
ProtocolsModule<>(CassandraJamesServerMain.cassandraId),
+ new MailetProcessingModule())
+ .with(new TestFilesystemModule(folder),
cassandra,
dns,
elasticSearch,
- jmap)));
+ jmap));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
index 12770b4..c51a7fb 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
@@ -57,6 +57,9 @@
<name>X-UserIsAuth</name>
<value>true</value>
</mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>bcc</name>
+ </mailet>
<mailet
match="HasMailAttribute=org.apache.james.SMIMECheckSignature"
class="SetMimeHeader">
<name>X-WasSigned</name>
<value>true</value>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 7b63477..afc2fd6 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -255,6 +255,12 @@
<version>${james.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice-common</artifactId>
+ <version>${james.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-imap</artifactId>
<version>${james-protocols.version}</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/README.adoc
----------------------------------------------------------------------
diff --git a/server/container/cassandra-guice/README.adoc
b/server/container/cassandra-guice/README.adoc
deleted file mode 100644
index e3648ff..0000000
--- a/server/container/cassandra-guice/README.adoc
+++ /dev/null
@@ -1,45 +0,0 @@
-= Guice-Cassandra Module How-to
-
-== Building
-
-=== Requirements
-
- * Java 8 SDK
- * Docker
- * Maven
-
-=== Building the artifacts
-
-An usual compilation using maven will produce two artifacts into target
directory :
-
- * james-server-cassandra-guice-${version}.jar
- * james-server-cassandra-guice-${version}.lib
-
-== Running
-
-=== Requirements
-
- * Cassandra
- * ElasticSearch 1.5.2
-
-=== James Launch
-
-To run james, you have to create a directory containing required configuration
files.
-
-A sample directory (appropriately named sample-directory) is provided with some
-default value you may need to replace.
-
-You also need to generate a keystore with the following command :
-[source]
-----
-$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
-----
-
-You need to have a Cassandra and an ElasticSearch instance running.
-
-Once everything is set up, you just have to run the jar with :
-
-[source]
-----
-$ java -Dworking.directory=sample-configuration -jar
target/james-server-cassandra-guice-${version}.jar
-----
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cassandra-guice/pom.xml
b/server/container/cassandra-guice/pom.xml
deleted file mode 100644
index f35d980..0000000
--- a/server/container/cassandra-guice/pom.xml
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server</artifactId>
- <version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>james-server-cassandra-guice</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache James :: Server :: Cassandra - guice injection</name>
- <description>An advanced email server - Cassandra backend with guice
injection</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>disable-build-for-older-jdk</id>
- <activation>
- <jdk>(,1.8)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>jar</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>test-jar</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <executions>
- <execution>
- <id>default-install</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>default-resources</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testResources</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>build-for-jdk-8</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
-
<classpathPrefix>${project.build.finalName}.lib/</classpathPrefix>
-
<mainClass>org.apache.james.CassandraJamesServerMain</mainClass>
-
<useUniqueVersions>false</useUniqueVersions>
- </manifest>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tool</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-standard</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-file</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-cassandra</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-dnsjava</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-fetchmail</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-jmap</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailbox-adapter</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailets</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-imap4</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-protocols-library</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-lmtp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-managesieve</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-pop3</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-smtp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-activemq</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-file</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-jms</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- </dependency>
- <dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- </dependency>
- <dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.nurkiewicz.asyncretry</groupId>
- <artifactId>asyncretry</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- <version>3.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>tools</artifactId>
- <groupId>com.sun</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.onami.lifecycle</groupId>
- <artifactId>org.apache.onami.lifecycle.jsr250</artifactId>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj-3.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cassandraunit</groupId>
- <artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>1.5.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>disable-animal-sniffer</id>
- <activation>
- <jdk>[1.6,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>check_java_6</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/cassandra.properties
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/cassandra.properties
b/server/container/cassandra-guice/sample-configuration/cassandra.properties
deleted file mode 100644
index 1358332..0000000
--- a/server/container/cassandra-guice/sample-configuration/cassandra.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# Configuration file for cassandra mailbox
-
-cassandra.ip=172.17.0.2
-cassandra.port=9042
-cassandra.keyspace=apache_james
-cassandra.replication.factor=1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/dnsservice.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/dnsservice.xml
b/server/container/cassandra-guice/sample-configuration/dnsservice.xml
deleted file mode 100644
index 0978a00..0000000
--- a/server/container/cassandra-guice/sample-configuration/dnsservice.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<dnsservice>
- <servers>
- <server>8.8.8.8</server>
- <server>62.210.16.6</server>
- </servers>
- <autodiscover>false</autodiscover>
- <authoritative>false</authoritative>
- <maxcachesize>50000</maxcachesize>
-</dnsservice>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/domainlist.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/domainlist.xml
b/server/container/cassandra-guice/sample-configuration/domainlist.xml
deleted file mode 100644
index 8d00118..0000000
--- a/server/container/cassandra-guice/sample-configuration/domainlist.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
- <domainnames>
- <domainname>james.apache.org</domainname>
- </domainnames>
- <autodetect>true</autodetect>
- <autodetectIP>true</autodetectIP>
- <defaultDomain>localhost</defaultDomain>
-</domainlist>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/elasticsearch.properties
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/elasticsearch.properties
b/server/container/cassandra-guice/sample-configuration/elasticsearch.properties
deleted file mode 100644
index 924404c..0000000
---
a/server/container/cassandra-guice/sample-configuration/elasticsearch.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# This template file can be used as example for James Server configuration
-# DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Configuration file for ElasticSearch
-
-elasticsearch.masterHost=172.17.0.1
-elasticsearch.port=9300
-elasticsearch.nb.shards=1
-elasticsearch.nb.replica=0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/imapserver.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/imapserver.xml
b/server/container/cassandra-guice/sample-configuration/imapserver.xml
deleted file mode 100644
index c03b978..0000000
--- a/server/container/cassandra-guice/sample-configuration/imapserver.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-<imapservers>
- <imapserver enabled="true">
- <jmxName>imapserver</jmxName>
- <bind>0.0.0.0:1143</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="false" startTLS="true">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore
/path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
-
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- </tls>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- </imapserver>
- <imapserver enabled="true">
- <jmxName>imapserver-ssl</jmxName>
- <bind>0.0.0.0:1993</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="true" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore
/path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
-
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- </tls>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- </imapserver>
-</imapservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/jcr-repository.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/jcr-repository.xml
b/server/container/cassandra-guice/sample-configuration/jcr-repository.xml
deleted file mode 100644
index c1b998a..0000000
--- a/server/container/cassandra-guice/sample-configuration/jcr-repository.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- This template file can be used as example for James Server configuration
- DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<!DOCTYPE Repository
- PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN"
- "http://jackrabbit.apache.org/dtd/repository-2.0.dtd";>
-
-<Repository>
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/repository"/>
- </FileSystem>
- <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
- <Security appName="Jackrabbit">
- <SecurityManager
class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
workspaceName="security">
- </SecurityManager>
- <AccessManager
class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
- </AccessManager>
- <LoginModule
class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
- <param name="anonymousId" value="anonymous"/>
- <param name="adminId" value="admin"/>
- </LoginModule>
- </Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="james"/>
- <Workspace name="${wsp.name}">
- <FileSystem
class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${wsp.home}"/>
- </FileSystem>
- <PersistenceManager
class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
- <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
- <param name="schemaObjectPrefix" value="${wsp.name}_"/>
- </PersistenceManager>
- <SearchIndex
class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${wsp.home}/index"/>
- <param name="supportHighlighting" value="true"/>
- </SearchIndex>
- </Workspace>
- <Versioning rootPath="${rep.home}/version">
- <FileSystem
class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/version" />
- </FileSystem>
- <PersistenceManager
class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
- <param name="url"
value="jdbc:derby:${rep.home}/version/db;create=true"/>
- <param name="schemaObjectPrefix" value="version_"/>
- </PersistenceManager>
- </Versioning>
- <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${rep.home}/repository/index"/>
- <param name="supportHighlighting" value="true"/>
- </SearchIndex>
-</Repository>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/jmap.properties
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/jmap.properties
b/server/container/cassandra-guice/sample-configuration/jmap.properties
deleted file mode 100644
index d785ccd..0000000
--- a/server/container/cassandra-guice/sample-configuration/jmap.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Configuration file for JMAP
-
-tls.keystoreURL=file://conf/keystore
-tls.secret=james72laBalle
-
-#
-# If you wish to use OAuth authentication, you should provide a valid JWT
public key.
-# The following entry specify the link to the URL of the public key file,
-# which should be a PEM format file.
-#
-jwt.publickeypem.url=
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/jmx.properties
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/jmx.properties
b/server/container/cassandra-guice/sample-configuration/jmx.properties
deleted file mode 100644
index a1dbdf8..0000000
--- a/server/container/cassandra-guice/sample-configuration/jmx.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# This template file can be used as example for James Server configuration
-# DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# This template file can be used as example for James Server configuration
-# DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# See http://james.apache.org/server/3/config.html for usage
-
-jmx.address=127.0.0.1
-jmx.port=9999
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/lmtpserver.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/lmtpserver.xml
b/server/container/cassandra-guice/sample-configuration/lmtpserver.xml
deleted file mode 100644
index 87a0caa..0000000
--- a/server/container/cassandra-guice/sample-configuration/lmtpserver.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<lmtpservers>
-
- <lmtpserver enabled="false">
- <jmxName>lmtpserver</jmxName>
- <!-- LMTP should not be reachable from outside your network so bind it
to loopback-->
- <bind>127.0.0.1:1024</bind>
- <connectionBacklog>200</connectionBacklog>
- <connectiontimeout>1200</connectiontimeout>
- <!-- Set the maximum simultaneous incoming connections for this
service -->
- <connectionLimit>0</connectionLimit>
- <!-- Set the maximum simultaneous incoming connections per IP for this
service -->
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <!-- This sets the maximum allowed message size (in kilobytes) for
this -->
- <!-- LMTP service. If unspecified, the value defaults to 0, which
means no limit. -->
- <maxmessagesize>0</maxmessagesize>
- <handlerchain>
- <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </lmtpserver>
-
-</lmtpservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/mailetcontainer.xml
b/server/container/cassandra-guice/sample-configuration/mailetcontainer.xml
deleted file mode 100644
index 968b59c..0000000
--- a/server/container/cassandra-guice/sample-configuration/mailetcontainer.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<mailetcontainer enableJmx="true">
-
- <context>
- <postmaster>postmas...@james.minet.net</postmaster>
- </context>
-
- <spooler>
- <threads>20</threads>
- </spooler>
-
- <processors>
- <processor state="root" enableJmx="true">
- <mailet match="All" class="PostmasterAlias"/>
- <mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemana...@james.linagora.com
- Mail send to this address will get interpreted with SIEVE
Manage -->
- <mailet match="RecipientIs=sievemana...@james.linagora.com"
class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org."
class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known
-->
- <!-- black holes, open relays, and spam servers to the spam
processor -->
- <!-- For this set to function properly, the spam processor must be
configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org."
class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see
http://njabl.org/</notice>
- </mailet>
- <mailet match="All" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- </processor>
-
- <processor state="error" enableJmx="true">
- <mailet match="All" class="Bounce"/>
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/error/</repositoryPath>
- </mailet>
- </processor>
-
-
- <processor state="transport" enableJmx="true">
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
- <mailet
match="HasMailAttribute=org.apache.james.SMIMECheckSignature"
class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- </mailet>
- <mailet match="All" class="RecipientRewriteTable" />
- <mailet match="RecipientIsLocal" class="LocalDelivery"/>
- <mailet match="HostIsLocal" class="ToProcessor">
- <processor>local-address-error</processor>
- <notice>550 - Requested action not taken: no such user
here</notice>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
- <delayTime>5000, 100000, 500000</delayTime>
- <maxRetries>25</maxRetries>
- <maxDnsProblemRetries>0</maxDnsProblemRetries>
- <deliveryThreads>10</deliveryThreads>
- <sendpartial>true</sendpartial>
- <bounceProcessor>bounces</bounceProcessor>
- </mailet>
- <mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet>
- </processor>
-
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
- <processor state="local-address-error" enableJmx="true">
- <mailet match="All" class="Bounce">
- <attachment>none</attachment>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/address-error/</repositoryPath>
- </mailet>
- </processor>
-
- <processor state="relay-denied" enableJmx="true">
- <mailet match="All" class="Bounce">
- <attachment>none</attachment>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/relay-denied/</repositoryPath>
- <notice>Warning: You are sending an e-mail to a remote server.
You must be authentified to perform such an operation</notice>
- </mailet>
- </processor>
-
- <processor state="bounces" enableJmx="true">
- <mailet match="All" class="DSNBounce">
- <passThrough>false</passThrough>
- </mailet>
- </processor>
- </processors>
-
-</mailetcontainer>
-
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/mailrepositorystore.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/mailrepositorystore.xml
b/server/container/cassandra-guice/sample-configuration/mailrepositorystore.xml
deleted file mode 100644
index acca810..0000000
---
a/server/container/cassandra-guice/sample-configuration/mailrepositorystore.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<mailrepositorystore>
- <mailrepositories>
- <!-- File based repositories. These repositories store all message
data -->
- <!-- in the file system. -->
- <mailrepository
class="org.apache.james.mailrepository.file.FileMailRepository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <!-- Set if the messages should be listed sorted. False by default
-->
- <config FIFO="false" CACHEKEYS="true"/>
- </mailrepository>
- </mailrepositories>
-</mailrepositorystore>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/pop3server.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/pop3server.xml
b/server/container/cassandra-guice/sample-configuration/pop3server.xml
deleted file mode 100644
index c57c832..0000000
--- a/server/container/cassandra-guice/sample-configuration/pop3server.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-
-<pop3servers>
- <pop3server enabled="false">
- <jmxName>pop3server</jmxName>
- <bind>0.0.0.0:1110</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="false" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore
/path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
-
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- </tls>
- <connectiontimeout>1200</connectiontimeout>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <handlerchain>
- <handler
class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
- </handlerchain>
- </pop3server>
-</pop3servers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/recipientrewritetable.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/recipientrewritetable.xml
b/server/container/cassandra-guice/sample-configuration/recipientrewritetable.xml
deleted file mode 100644
index 7e7f586..0000000
---
a/server/container/cassandra-guice/sample-configuration/recipientrewritetable.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable
class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
- <recursiveMapping>true</recursiveMapping>
- <mappingLimit>10</mappingLimit>
- <mapping>some@domain=some</mapping>
-</recipientrewritetable>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/517a4cfe/server/container/cassandra-guice/sample-configuration/smtpserver.xml
----------------------------------------------------------------------
diff --git
a/server/container/cassandra-guice/sample-configuration/smtpserver.xml
b/server/container/cassandra-guice/sample-configuration/smtpserver.xml
deleted file mode 100644
index c34fcd1..0000000
--- a/server/container/cassandra-guice/sample-configuration/smtpserver.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<smtpservers>
- <smtpserver enabled="true">
- <jmxName>smtpserver-global</jmxName>
- <bind>0.0.0.0:1025</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="false" startTLS="false">
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
-
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- <algorithm>SunX509</algorithm>
- </tls>
- <connectiontimeout>360</connectiontimeout>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <authRequired>false</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <verifyIdentity>true</verifyIdentity>
- <maxmessagesize>0</maxmessagesize>
- <addressBracketsEnforcement>true</addressBracketsEnforcement>
- <smtpGreeting>JAMES Linagora's SMTP awesome Server</smtpGreeting>
- <handlerchain>
- <handler
class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
- <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </smtpserver>
- <smtpserver enabled="true">
- <jmxName>smtpserver-TLS</jmxName>
- <bind>0.0.0.0:1465</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="true" startTLS="false">
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
-
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- <algorithm>SunX509</algorithm>
- </tls>
- <connectiontimeout>360</connectiontimeout>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <!--
- Authorize only local users
- -->
- <authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <!-- Trust authenticated users -->
- <verifyIdentity>false</verifyIdentity>
- <maxmessagesize>0</maxmessagesize>
- <addressBracketsEnforcement>true</addressBracketsEnforcement>
- <smtpGreeting>JAMES Linagora's SMTP awesome Server</smtpGreeting>
- <handlerchain>
- <handler
class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
- <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </smtpserver>
- <smtpserver enabled="true">
- <jmxName>smtpserver-authenticated</jmxName>
- <bind>0.0.0.0:1587</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="false" startTLS="true">
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
-
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- <algorithm>SunX509</algorithm>
- </tls>
- <connectiontimeout>360</connectiontimeout>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <!--
- Authorize only local users
- -->
- <authRequired>true</authRequired>
- <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
- <!-- Trust authenticated users -->
- <verifyIdentity>false</verifyIdentity>
- <maxmessagesize>0</maxmessagesize>
- <addressBracketsEnforcement>true</addressBracketsEnforcement>
- <smtpGreeting>JAMES Linagora's SMTP awesome Server</smtpGreeting>
- <handlerchain>
- <handler
class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
- <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </smtpserver>
-</smtpservers>
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
