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/09/05 12:51:31 UTC
[2/2] james-project git commit: JAMES-1818 Move MockAuthenticator
into main
JAMES-1818 Move MockAuthenticator into main
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c9b67ae5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c9b67ae5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c9b67ae5
Branch: refs/heads/master
Commit: c9b67ae581d5ee687d6d6f20f894b857072b4998
Parents: 47cfda6
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Fri Sep 2 17:31:57 2016 +0200
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Mon Sep 5 14:49:07 2016 +0200
----------------------------------------------------------------------
.../ElasticSearchIntegrationTest.java | 4 +-
.../search/LuceneMessageSearchIndexTest.java | 4 +-
.../inmemory/InMemoryMailboxManagerTest.java | 4 +-
.../manager/InMemoryIntegrationResources.java | 4 +-
.../search/SimpleMessageSearchIndexTest.java | 4 +-
.../james/mailbox/store/FakeAuthenticator.java | 43 ++++++++++++++++++++
.../james/mailbox/store/MockAuthenticator.java | 43 --------------------
.../mailbox/store/StoreMailboxManagerTest.java | 2 +-
.../cassandra/host/CassandraHostSystem.java | 6 +--
.../host/ElasticSearchHostSystem.java | 6 +--
.../imapmailbox/hbase/host/HBaseHostSystem.java | 6 +--
.../InMemoryEventAsynchronousHostSystem.java | 6 +--
.../inmemory/host/InMemoryHostSystem.java | 6 +--
.../mpt/imapmailbox/jcr/host/JCRHostSystem.java | 6 +--
.../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 6 +--
.../maildir/host/MaildirHostSystem.java | 6 +--
.../adapter/mailbox/MailboxManagementTest.java | 4 +-
17 files changed, 80 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
index 5d55b63..edfc939 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.search.AbstractMessageSearchIndexTest;
@@ -72,7 +72,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
new MessageToElasticSearchJson(new DefaultTextExtractor(), ZoneId.of("Europe/Paris")));
storeMailboxManager = new InMemoryMailboxManager(
mapperFactory,
- new MockAuthenticator(),
+ new FakeAuthenticator(),
new JVMMailboxPathLocker(),
new UnionMailboxACLResolver(),
new SimpleGroupMembershipResolver(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
index 51f5ae7..dd3bd62 100644
--- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
+++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
@@ -27,7 +27,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.search.AbstractMessageSearchIndexTest;
import org.apache.lucene.store.RAMDirectory;
@@ -45,7 +45,7 @@ public class LuceneMessageSearchIndexTest extends AbstractMessageSearchIndexTest
messageSearchIndex = new LuceneMessageSearchIndex(mapperFactory, new InMemoryId.Factory(), new RAMDirectory());
storeMailboxManager = new InMemoryMailboxManager(
mapperFactory,
- new MockAuthenticator(),
+ new FakeAuthenticator(),
new JVMMailboxPathLocker(),
new UnionMailboxACLResolver(),
new SimpleGroupMembershipResolver(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/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 e1b5007..40de979 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
@@ -25,7 +25,7 @@ import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.junit.runner.RunWith;
import org.xenei.junit.contract.Contract;
@@ -48,7 +48,7 @@ public class InMemoryMailboxManagerTest {
MessageParser messageParser = new MessageParser();
InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
- InMemoryMailboxManager mailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, new MockAuthenticator(), new JVMMailboxPathLocker(), aclResolver, groupMembershipResolver, messageParser);
+ InMemoryMailboxManager mailboxManager = new InMemoryMailboxManager(mailboxSessionMapperFactory, new FakeAuthenticator(), new JVMMailboxPathLocker(), aclResolver, groupMembershipResolver, messageParser);
try {
mailboxManager.init();
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/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 bd399a5..7539934 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
@@ -33,7 +33,7 @@ import org.apache.james.mailbox.manager.ManagerTestResources;
import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.NoMailboxPathLocker;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
@@ -49,7 +49,7 @@ public class InMemoryIntegrationResources implements IntegrationResources {
@Override
public MailboxManager createMailboxManager(GroupMembershipResolver groupMembershipResolver) throws MailboxException {
- MockAuthenticator mockAuthenticator = new MockAuthenticator();
+ FakeAuthenticator mockAuthenticator = new FakeAuthenticator();
mockAuthenticator.addUser(ManagerTestResources.USER, ManagerTestResources.USER_PASS);
InMemoryMailboxSessionMapperFactory mailboxSessionMapperFactory = new InMemoryMailboxSessionMapperFactory();
final StoreMailboxManager manager = new InMemoryMailboxManager(
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java b/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java
index 202cf7d..34e351d 100644
--- a/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java
+++ b/mailbox/scanning-search/src/test/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndexTest.java
@@ -26,7 +26,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.junit.Ignore;
@@ -42,7 +42,7 @@ public class SimpleMessageSearchIndexTest extends AbstractMessageSearchIndexTest
messageSearchIndex = new SimpleMessageSearchIndex(mapperFactory, mapperFactory);
storeMailboxManager = new InMemoryMailboxManager(
mapperFactory,
- new MockAuthenticator(),
+ new FakeAuthenticator(),
new JVMMailboxPathLocker(),
new UnionMailboxACLResolver(),
new SimpleGroupMembershipResolver(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
new file mode 100644
index 0000000..5ce3126
--- /dev/null
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
@@ -0,0 +1,43 @@
+/****************************************************************
+ * 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. *
+ ****************************************************************/
+package org.apache.james.mailbox.store;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class FakeAuthenticator implements Authenticator{
+
+ private final Map<String, String> users = new HashMap<String, String>();
+
+ public boolean isAuthentic(String userid, CharSequence passwd) {
+ String pass = users.get(userid);
+ if (pass != null) {
+ return passwd.toString().equals(pass);
+ }
+ return false;
+ }
+
+ public void addUser(String user, String password) {
+ users.put(user, password);
+ }
+
+ public void clear() {
+ users.clear();
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
deleted file mode 100644
index e231006..0000000
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
+++ /dev/null
@@ -1,43 +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. *
- ****************************************************************/
-package org.apache.james.mailbox.store;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class MockAuthenticator implements Authenticator{
-
- private final Map<String, String> users = new HashMap<String, String>();
-
- public boolean isAuthentic(String userid, CharSequence passwd) {
- String pass = users.get(userid);
- if (pass != null) {
- return passwd.toString().equals(pass);
- }
- return false;
- }
-
- public void addUser(String user, String password) {
- users .put(user, password);
- }
-
- public void clear() {
- users.clear();
- }
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
index 975e3e3..a81be1a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
@@ -55,7 +55,7 @@ public class StoreMailboxManagerTest {
mockedMailboxMapper = mock(MailboxMapper.class);
when(mockedMapperFactory.getMailboxMapper(mockedMailboxSession))
.thenReturn(mockedMailboxMapper);
- storeMailboxManager = new StoreMailboxManager(mockedMapperFactory, new MockAuthenticator(), new JVMMailboxPathLocker(), new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), new MessageParser());
+ storeMailboxManager = new StoreMailboxManager(mockedMapperFactory, new FakeAuthenticator(), new JVMMailboxPathLocker(), new UnionMailboxACLResolver(), new SimpleGroupMembershipResolver(), new MessageParser());
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
index 501296f..33bfdcf 100644
--- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
+++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
@@ -45,7 +45,7 @@ import org.apache.james.mailbox.cassandra.quota.CassandraPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
@@ -65,7 +65,7 @@ public class CassandraHostSystem extends JamesImapHostSystem {
Feature.ANNOTATION_SUPPORT);
private final CassandraMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private final CassandraCluster cassandraClusterSingleton;
public CassandraHostSystem() throws Exception {
@@ -81,7 +81,7 @@ public class CassandraHostSystem extends JamesImapHostSystem {
new CassandraAttachmentModule(),
new CassandraAnnotationModule());
cassandraClusterSingleton = CassandraCluster.create(mailboxModule);
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
com.datastax.driver.core.Session session = cassandraClusterSingleton.getConf();
CassandraModSeqProvider modSeqProvider = new CassandraModSeqProvider(session);
CassandraUidProvider uidProvider = new CassandraUidProvider(session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
index b354514..94c3106 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
+++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
@@ -47,7 +47,7 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
@@ -69,7 +69,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem {
private EmbeddedElasticSearch embeddedElasticSearch;
private Path tempDirectory;
private StoreMailboxManager mailboxManager;
- private MockAuthenticator userManager;
+ private FakeAuthenticator userManager;
public boolean addUser(String user, String password) throws Exception {
userManager.addUser(user, password);
@@ -100,7 +100,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem {
IndexCreationFactory.createIndex(new TestingClientProvider(embeddedElasticSearch.getNode()).get())
);
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory();
ElasticSearchListeningMessageSearchIndex searchIndex = new ElasticSearchListeningMessageSearchIndex(
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
index a205d32..4792a67 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
@@ -40,7 +40,7 @@ import org.apache.james.mailbox.hbase.HBaseMailboxSessionMapperFactory;
import org.apache.james.mailbox.hbase.mail.HBaseModSeqProvider;
import org.apache.james.mailbox.hbase.mail.HBaseUidProvider;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
@@ -64,7 +64,7 @@ public class HBaseHostSystem extends JamesImapHostSystem {
public static Boolean useMiniCluster = true;
private final HBaseMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private MiniHBaseCluster hbaseCluster;
private final Configuration conf;
@@ -89,7 +89,7 @@ public class HBaseHostSystem extends JamesImapHostSystem {
conf = HBaseConfiguration.create();
}
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
final HBaseModSeqProvider modSeqProvider = new HBaseModSeqProvider(conf);
final HBaseUidProvider uidProvider = new HBaseUidProvider(conf);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java
index fb491d1..7f71bd4 100644
--- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java
+++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java
@@ -33,7 +33,7 @@ import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager;
import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.quota.QuotaRootResolver;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.event.AsynchronousEventDelivery;
@@ -53,7 +53,7 @@ public class InMemoryEventAsynchronousHostSystem extends JamesImapHostSystem {
private static final ImapFeatures SUPPORTED_FEATURES = ImapFeatures.of(Feature.NAMESPACE_SUPPORT);
private StoreMailboxManager mailboxManager;
- private MockAuthenticator userManager;
+ private FakeAuthenticator userManager;
public static JamesImapHostSystem build() throws Exception {
return new InMemoryEventAsynchronousHostSystem();
@@ -74,7 +74,7 @@ public class InMemoryEventAsynchronousHostSystem extends JamesImapHostSystem {
}
private void initFields() throws MailboxException {
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory();
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/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 674a68c..4de9ee9 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
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator;
@@ -56,7 +56,7 @@ public class InMemoryHostSystem extends JamesImapHostSystem {
Feature.ANNOTATION_SUPPORT);
private InMemoryMailboxManager mailboxManager;
- private MockAuthenticator userManager;
+ private FakeAuthenticator userManager;
public static JamesImapHostSystem build() throws Exception {
return new InMemoryHostSystem();
@@ -77,7 +77,7 @@ public class InMemoryHostSystem extends JamesImapHostSystem {
}
private void initFields() throws MailboxException {
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
MessageParser messageParser = new MessageParser();
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
index 9f1724e..5536540 100644
--- a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
+++ b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
@@ -41,7 +41,7 @@ import org.apache.james.mailbox.jcr.mail.JCRModSeqProvider;
import org.apache.james.mailbox.jcr.mail.JCRUidProvider;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
import org.apache.james.mailbox.store.quota.NoQuotaManager;
@@ -59,7 +59,7 @@ public class JCRHostSystem extends JamesImapHostSystem{
}
private final JCRMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private static final String JACKRABBIT_HOME = "target/jackrabbit";
public static final String META_DATA_DIRECTORY = "target/user-meta-data";
@@ -83,7 +83,7 @@ public class JCRHostSystem extends JamesImapHostSystem{
// Register imap cnd file
JCRUtils.registerCnd(repository, workspace, user, pass);
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
JCRUidProvider uidProvider = new JCRUidProvider(locker, sessionRepos);
JCRModSeqProvider modSeqProvider = new JCRModSeqProvider(locker, sessionRepos);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
index 1889f2c..f03df7e 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
@@ -48,7 +48,7 @@ import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
import org.apache.james.mailbox.store.quota.NoQuotaManager;
@@ -69,7 +69,7 @@ public class JPAHostSystem extends JamesImapHostSystem {
}
private final OpenJPAMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private final EntityManagerFactory entityManagerFactory;
public JPAHostSystem() throws Exception {
@@ -112,7 +112,7 @@ public class JPAHostSystem extends JamesImapHostSystem {
JPAUserFlag.class.getName() + ";" +
JPASubscription.class.getName() + ")");
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
entityManagerFactory = OpenJPAPersistence.getEntityManagerFactory(properties);
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
JPAUidProvider uidProvider = new JPAUidProvider(locker, entityManagerFactory);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
index 52defda..73f132c 100644
--- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
+++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
@@ -34,7 +34,7 @@ import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
import org.apache.james.mailbox.maildir.MaildirStore;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
@@ -52,7 +52,7 @@ public class MaildirHostSystem extends JamesImapHostSystem {
private static final ImapFeatures SUPPORTED_FEATURES = ImapFeatures.of();
private final StoreMailboxManager mailboxManager;
- private final MockAuthenticator userManager;
+ private final FakeAuthenticator userManager;
private final MaildirMailboxSessionMapperFactory mailboxSessionMapperFactory;
public static JamesImapHostSystem build() throws Exception {
@@ -60,7 +60,7 @@ public class MaildirHostSystem extends JamesImapHostSystem {
}
public MaildirHostSystem() throws MailboxException {
- userManager = new MockAuthenticator();
+ userManager = new FakeAuthenticator();
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user", locker);
mailboxSessionMapperFactory = new MaildirMailboxSessionMapperFactory(store);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9b67ae5/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index e38e78b..49dabd6 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -28,7 +28,7 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
-import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
@@ -53,7 +53,7 @@ public class MailboxManagementTest {
inMemoryMapperFactory = new InMemoryMailboxSessionMapperFactory();
StoreMailboxManager mailboxManager = new StoreMailboxManager(
inMemoryMapperFactory,
- new MockAuthenticator(),
+ new FakeAuthenticator(),
new JVMMailboxPathLocker(),
new UnionMailboxACLResolver(),
new SimpleGroupMembershipResolver(),
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org