Author: norman
Date: Fri Jan 7 21:02:17 2011
New Revision: 1056505
URL: http://svn.apache.org/viewvc?rev=1056505&view=rev
Log:
Fix compile errors
Added:
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
Modified:
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAHostSystem.java
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
Modified:
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java?rev=1056505&r1=1056504&r2=1056505&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java
(original)
+++
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java
Fri Jan 7 21:02:17 2011
@@ -27,7 +27,6 @@ import org.apache.jackrabbit.core.config
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
import org.apache.james.imap.functional.ImapHostSystem;
-import org.apache.james.imap.functional.InMemoryUserManager;
import org.apache.james.imap.main.DefaultImapDecoderFactory;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.mailbox.MailboxSession;
@@ -37,6 +36,7 @@ import org.apache.james.mailbox.jcr.JCRM
import org.apache.james.mailbox.jcr.JCRSubscriptionManager;
import org.apache.james.mailbox.jcr.JCRUtils;
import org.apache.james.mailbox.jcr.mail.JCRCachingUidProvider;
+import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.test.functional.HostSystem;
import org.xml.sax.InputSource;
@@ -47,7 +47,7 @@ public class JCRHostSystem extends ImapH
}
private final JCRMailboxManager mailboxManager;
- private final InMemoryUserManager userManager;
+ private final MockAuthenticator userManager;
private static final String JACKRABBIT_HOME = "target/jackrabbit";
public static final String META_DATA_DIRECTORY = "target/user-meta-data";
@@ -69,7 +69,7 @@ public class JCRHostSystem extends ImapH
// Register imap cnd file
JCRUtils.registerCnd(repository, workspace, user, pass);
- userManager = new InMemoryUserManager();
+ userManager = new MockAuthenticator();
JCRCachingUidProvider uidProvider = new
JCRCachingUidProvider(sessionRepos);
JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos);
Modified:
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAHostSystem.java?rev=1056505&r1=1056504&r2=1056505&view=diff
==============================================================================
---
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAHostSystem.java
(original)
+++
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAHostSystem.java
Fri Jan 7 21:02:17 2011
@@ -29,7 +29,6 @@ import org.apache.commons.logging.impl.S
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
import org.apache.james.imap.functional.ImapHostSystem;
-import org.apache.james.imap.functional.InMemoryUserManager;
import org.apache.james.imap.main.DefaultImapDecoderFactory;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.mailbox.MailboxSession;
@@ -45,6 +44,7 @@ import org.apache.james.mailbox.jpa.mail
import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
+import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.test.functional.HostSystem;
import org.apache.openjpa.persistence.OpenJPAPersistence;
@@ -58,7 +58,7 @@ public class JPAHostSystem extends ImapH
}
private final OpenJPAMailboxManager mailboxManager;
- private final InMemoryUserManager userManager;
+ private final MockAuthenticator userManager;
private final EntityManagerFactory entityManagerFactory;
public JPAHostSystem() throws Exception {
@@ -76,7 +76,7 @@ public class JPAHostSystem extends ImapH
JPAMessage.class.getName() + ";" +
JPAProperty.class.getName() + ";" +
JPASubscription.class.getName() + ")");
- userManager = new InMemoryUserManager();
+ userManager = new MockAuthenticator();
entityManagerFactory =
OpenJPAPersistence.getEntityManagerFactory(properties);
JPACachingUidProvider uidProvider = new
JPACachingUidProvider(entityManagerFactory);
Modified:
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java?rev=1056505&r1=1056504&r2=1056505&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java
(original)
+++
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java
Fri Jan 7 21:02:17 2011
@@ -32,6 +32,7 @@ import org.apache.james.mailbox.maildir.
import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
import org.apache.james.mailbox.maildir.MaildirStore;
import org.apache.james.mailbox.maildir.MaildirSubscriptionManager;
+import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.test.functional.HostSystem;
public class MaildirHostSystem extends ImapHostSystem {
@@ -40,7 +41,7 @@ public class MaildirHostSystem extends I
private static final String MAILDIR_HOME = "target/Maildir";
private final MaildirMailboxManager mailboxManager;
- private final InMemoryUserManager userManager;
+ private final MockAuthenticator userManager;
private final MaildirMailboxSessionMapperFactory
mailboxSessionMapperFactory;
public static HostSystem build() throws Exception {
@@ -48,7 +49,7 @@ public class MaildirHostSystem extends I
}
public MaildirHostSystem() throws MailboxException {
- userManager = new InMemoryUserManager();
+ userManager = new MockAuthenticator();
MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user");
mailboxSessionMapperFactory = new
MaildirMailboxSessionMapperFactory(store);
MaildirSubscriptionManager sm = new
MaildirSubscriptionManager(mailboxSessionMapperFactory);
Modified:
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java?rev=1056505&r1=1056504&r2=1056505&view=diff
==============================================================================
---
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
(original)
+++
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
Fri Jan 7 21:02:17 2011
@@ -22,7 +22,6 @@ package org.apache.james.mailbox.inmemor
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
import org.apache.james.imap.functional.ImapHostSystem;
-import org.apache.james.imap.functional.InMemoryUserManager;
import org.apache.james.imap.main.DefaultImapDecoderFactory;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.mailbox.MailboxException;
@@ -30,12 +29,13 @@ import org.apache.james.mailbox.inmemory
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.inmemory.InMemorySubscriptionManager;
import org.apache.james.mailbox.inmemory.mail.InMemoryCachingUidProvider;
+import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.test.functional.HostSystem;
public class InMemoryHostSystem extends ImapHostSystem {
private InMemoryMailboxManager mailboxManager;
- private InMemoryUserManager userManager;
+ private MockAuthenticator userManager;
private InMemoryMailboxSessionMapperFactory factory;
static HostSystem build() throws Exception {
@@ -58,7 +58,7 @@ public class InMemoryHostSystem extends
}
private void initFields() throws MailboxException {
- userManager = new InMemoryUserManager();
+ userManager = new MockAuthenticator();
factory = new InMemoryMailboxSessionMapperFactory();
InMemoryCachingUidProvider uidProvider = new
InMemoryCachingUidProvider();
mailboxManager = new InMemoryMailboxManager(factory, userManager,
uidProvider);
Added:
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java?rev=1056505&view=auto
==============================================================================
---
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
(added)
+++
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/MockAuthenticator.java
Fri Jan 7 21:02:17 2011
@@ -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 MockAuthenticator implements Authenticator{
+
+ private 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();
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
