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 rd...@apache.org on 2009/06/11 10:54:00 UTC
svn commit: r783701 - in
/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver:
DefaultImapFactory.java ImapFactory.java ImapServer.java
Author: rdonkin
Date: Thu Jun 11 08:53:59 2009
New Revision: 783701
URL: http://svn.apache.org/viewvc?rev=783701&view=rev
Log:
Allow MailboxManagers to be injected into IMAP gluecode
Added:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapFactory.java (with props)
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java?rev=783701&r1=783700&r2=783701&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java Thu Jun 11 08:53:59 2009
@@ -23,57 +23,43 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.main.DefaultImapDecoderFactory;
-import org.apache.james.imap.main.ImapRequestHandler;
-import org.apache.james.imap.decode.ImapDecoder;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
-import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.mailboxmanager.torque.DefaultMailboxManager;
import org.apache.james.mailboxmanager.torque.DefaultUserManager;
import org.apache.james.services.FileSystem;
import org.apache.james.user.impl.file.FileUserMetaDataRepository;
-public class DefaultImapFactory {
+public class DefaultImapFactory extends ImapFactory {
- private final ImapEncoder encoder;
- private final ImapDecoder decoder;
- private final ImapProcessor processor;
- private final DefaultMailboxManager mailboxManager;
public DefaultImapFactory(FileSystem fileSystem, UsersRepository users, Logger logger) {
- super();
- decoder = new DefaultImapDecoderFactory().buildImapDecoder();
- encoder = new DefaultImapEncoderFactory().buildImapEncoder();
- mailboxManager = new DefaultMailboxManager(new DefaultUserManager(
- new FileUserMetaDataRepository("var/users"), users), fileSystem, logger);
- processor = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager);
+ super(fileSystem, users, logger, new DefaultMailboxManager(new DefaultUserManager(
+ new FileUserMetaDataRepository("var/users"), users), fileSystem, logger));
}
/**
* @see org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
*/
+ @Override
public void configure( final Configuration configuration ) throws ConfigurationException {
- mailboxManager.configure(configuration);
+ super.configure(configuration);
+ final MailboxManager mailbox = getMailbox();
+ if (mailbox instanceof DefaultMailboxManager) {
+ final DefaultMailboxManager manager = (DefaultMailboxManager) mailbox;
+ manager.configure(configuration);
+ }
}
+ @Override
public void initialize() throws Exception {
- mailboxManager.initialize();
+ super.initialize();
+ final MailboxManager mailbox = getMailbox();
+ if (mailbox instanceof DefaultMailboxManager) {
+ final DefaultMailboxManager manager = (DefaultMailboxManager) mailbox;
+ manager.initialize();
+ }
}
- public ImapRequestHandler createHandler()
- {
- return new ImapRequestHandler(decoder, processor, encoder);
- }
-
- /**
- * This is required until James supports IoC assembly.
- * @return the mailbox
- */
- public final MailboxManager getMailbox() {
- return mailboxManager;
- }
+
}
Added: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapFactory.java?rev=783701&view=auto
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapFactory.java (added)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapFactory.java Thu Jun 11 08:53:59 2009
@@ -0,0 +1,71 @@
+/****************************************************************
+ * 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.imapserver;
+
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.james.api.user.UsersRepository;
+import org.apache.james.imap.api.process.ImapProcessor;
+import org.apache.james.imap.decode.ImapDecoder;
+import org.apache.james.imap.encode.ImapEncoder;
+import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
+import org.apache.james.imap.mailbox.MailboxManager;
+import org.apache.james.imap.main.DefaultImapDecoderFactory;
+import org.apache.james.imap.main.ImapRequestHandler;
+import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
+import org.apache.james.services.FileSystem;
+
+public abstract class ImapFactory {
+
+ private final ImapEncoder encoder;
+ private final ImapDecoder decoder;
+ private final ImapProcessor processor;
+ private final MailboxManager mailboxManager;
+
+ public ImapFactory (FileSystem fileSystem, UsersRepository users, Logger logger,
+ final MailboxManager mailboxManager) {
+ super();
+ decoder = new DefaultImapDecoderFactory().buildImapDecoder();
+ encoder = new DefaultImapEncoderFactory().buildImapEncoder();
+ processor = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager);
+ this.mailboxManager = mailboxManager;
+ }
+
+ public ImapRequestHandler createHandler() {
+ return new ImapRequestHandler(decoder, processor, encoder);
+ }
+
+ /**
+ * This is required until James supports IoC assembly.
+ * @return the mailbox
+ */
+ public final MailboxManager getMailbox() {
+ return mailboxManager;
+ }
+
+ public void initialize() throws Exception {
+ // Do nothing
+ }
+
+ public void configure(final Configuration configuration) throws ConfigurationException {
+ // Do nothing
+ }
+}
Propchange: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java?rev=783701&r1=783700&r2=783701&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java Thu Jun 11 08:53:59 2009
@@ -55,7 +55,7 @@
{
private static final String softwaretype = "JAMES "+VERSION+" Server " + Constants.SOFTWARE_VERSION;
- private DefaultImapFactory factory;
+ private ImapFactory factory;
private String hello = softwaretype;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org