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 da...@apache.org on 2006/10/31 18:02:08 UTC
svn commit: r469558 [1/2] - in
/james/server/sandbox/mailet-refactorings/src: java/org/apache/james/
java/org/apache/james/core/ java/org/apache/james/mailrepository/
java/org/apache/james/transport/ java/org/apache/james/transport/mailets/
java/org/ap...
Author: danny
Date: Tue Oct 31 09:02:05 2006
New Revision: 469558
URL: http://svn.apache.org/viewvc?view=rev&rev=469558
Log:
removed service lookup for mail repo by adding MailetContext repository accessor
removed references to MailImpl by use of MailFactory accessed from MailetContext
Added:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/JamesMailFactory.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/MailFactory.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/MailetUtil.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/MimeMessageUtil.java
Removed:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageUtil.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/util/mailet/MailetUtil.java
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/Constants.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailHeaders.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailImpl.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageWrapper.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MessageInputStream.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/JamesMailetLoader.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/Loader.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractAddFooter.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractNotify.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractRedirect.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddFooter.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddSubjectPrefix.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysis.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Bounce.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservFooter.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/DSNBounce.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Forward.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListserv.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListservManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCAlias.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCListserv.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LogMessage.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifySender.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/OnlyText.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/PostmasterAlias.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Redirect.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMimeHeader.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ReplaceContent.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ServerTime.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMailAttribute.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMimeHeader.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SpamAssassin.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToProcessor.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/UnwrapText.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/WhiteListManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/WrapText.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/Mail.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/MailetContext.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/core/MimeMessageUtilTest.java
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/Constants.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/Constants.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/Constants.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/Constants.java Tue Oct 31 09:02:05 2006
@@ -30,6 +30,42 @@
*/
public class Constants {
+
+
+
+ /**
+ * The name of the software (i.e. James).
+ */
+
+ public static final String SERVER_NAMES = "SERVER_NAMES";
+
+
+ /**
+ * Context key used to store the postmaster address for
+ * this James instance in the context.
+ */
+ public static final String POSTMASTER = "POSTMASTER";
+
+
+
+ /**
+ * Context key used to store the enableAliases configuration for the default
+ * LocalUsers Repository.
+ */
+ public static final String DEFAULT_ENABLE_ALIASES = "JAMES_DEFAULT_ENABLE_ALIASES";
+
+ /**
+ * Context key used to store the enableForwarding configuration for the default
+ * LocalUsers Repository.
+ */
+ public static final String DEFAULT_ENABLE_FORWARDING = "JAMES_DEFAULT_ENABLE_FORWARDING";
+
+ /**
+ * Context key used to store the ignoreCase configuration for the
+ * UserRepository
+ */
+ public static final String DEFAULT_IGNORE_USERNAME_CASE = "JAMES_DEFAULT_IGNORE_USERNAME_CASE";
+
/**
* The version of James.
*/
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java Tue Oct 31 09:02:05 2006
@@ -50,9 +50,11 @@
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailFactory;
import org.apache.mailet.MailRepository;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetContext;
+import org.apache.mailet.MailetException;
import org.apache.mailet.RFC2822Headers;
import org.apache.mailet.UsersRepository;
@@ -171,6 +173,8 @@
private DomainList domains;
+ private MailFactory mailFactory = new JamesMailFactory();
+
/**
* @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
*/
@@ -729,6 +733,33 @@
public MailAddress getPostmaster() {
return postmaster;
}
+
+ /**
+ * @param repoPath
+ * @return
+ * @throws MailetException
+ */
+ public MailRepository getMailRepository(String repoPath) throws MailetException {
+
+ MailRepository repo;
+ ServiceManager compMgr = (ServiceManager) getAttribute(Constants.AVALON_COMPONENT_MANAGER);
+ Store mailstore;
+ try{
+ mailstore = (Store) compMgr.lookup(Store.ROLE);
+ }catch (ServiceException e){
+ throw new MailetException("Failed to lookup mailstore");
+ }
+ DefaultConfiguration mailConf
+ = new DefaultConfiguration("repository", "generated:ToRepository");
+ mailConf.setAttribute("destinationURL", repoPath);
+ mailConf.setAttribute("type", "MAIL");
+ try{
+ repo = (MailRepository) mailstore.select(mailConf);
+ }catch (ServiceException e){
+ throw new MailetException("Failed to lookup repository "+repoPath+" in mailstore");
+ }
+ return repo;
+ }
/**
* @see org.apache.mailet.MailetContext#getMajorVersion()
@@ -861,5 +892,14 @@
MailImpl m = new MailImpl(getId(),sender,recipients,msg);
localDeliveryMailet.service(m);
ContainerUtil.dispose(m);
+ }
+
+ /**
+ * @see org.apache.mailet.MailetContext#getMailFactory()
+ */
+ public MailFactory getMailFactory() {
+
+
+ return mailFactory ;
}
}
Added: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/JamesMailFactory.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/JamesMailFactory.java?view=auto&rev=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/JamesMailFactory.java (added)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/JamesMailFactory.java Tue Oct 31 09:02:05 2006
@@ -0,0 +1,58 @@
+/*
+ * Created on Oct 31, 2006
+ *
+ * PVCS Workfile Details:
+ * $Workfile$
+ * $Revision$
+ * $Author$
+ * $Date$
+ * $Modtime$
+ */
+
+package org.apache.james;
+
+import java.util.Collection;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import org.apache.james.core.MailImpl;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailFactory;
+
+
+/**
+ * @author angusd
+ * @author $Author$
+ * @version $Revision$
+ */
+public class JamesMailFactory implements MailFactory {
+
+ /**
+ * @throws MessagingException
+ * @see org.apache.mailet.MailFactory#newMail(java.lang.String, org.apache.mailet.MailAddress, java.util.Collection, javax.mail.internet.MimeMessage)
+ */
+ public Mail newMail(String id, MailAddress sender, Collection recipients, MimeMessage message) throws MessagingException {
+
+
+ return new MailImpl(id, sender, recipients, message);
+ }
+
+ /**
+ * @throws MessagingException
+ * @see org.apache.mailet.MailFactory#newMail(org.apache.mailet.Mail)
+ */
+ public Mail newMail(Mail originalMail) throws MessagingException {
+
+
+ return new MailImpl(originalMail);
+ }
+
+}
+
+
+/*
+ *
+ * PVCS Log History:
+ * $Log$
+ *
+ */
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailHeaders.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailHeaders.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailHeaders.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailHeaders.java Tue Oct 31 09:02:05 2006
@@ -104,19 +104,11 @@
return (value != null && value.length != 0);
}
- /**
- * If the new header is a Return-Path we get sure that we add it to the top
- * Javamail, at least until 1.4.0 does the wrong thing if it loaded a stream with
- * a return-path in the middle.
- *
- * @see javax.mail.internet.InternetHeaders#addHeader(java.lang.String, java.lang.String)
- */
+
public void addHeader(String arg0, String arg1) {
- if (RFC2822Headers.RETURN_PATH.equalsIgnoreCase(arg0)) {
- headers.add(0, new InternetHeader(arg0, arg1));
- } else {
+
super.addHeader(arg0, arg1);
- }
+
}
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailImpl.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailImpl.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailImpl.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MailImpl.java Tue Oct 31 09:02:05 2006
@@ -25,6 +25,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MimeMessageUtil;
import org.apache.mailet.RFC2822Headers;
import javax.mail.Address;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java Tue Oct 31 09:02:05 2006
@@ -23,6 +23,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.mailet.MimeMessageUtil;
import javax.activation.DataHandler;
import javax.mail.Address;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageWrapper.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageWrapper.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageWrapper.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/MimeMessageWrapper.java Tue Oct 31 09:02:05 2006
@@ -25,6 +25,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.io.IOUtil;
+import org.apache.mailet.MimeMessageUtil;
import javax.activation.DataHandler;
import javax.mail.MessagingException;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MessageInputStream.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MessageInputStream.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MessageInputStream.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MessageInputStream.java Tue Oct 31 09:02:05 2006
@@ -1,8 +1,8 @@
package org.apache.james.mailrepository;
import org.apache.avalon.cornerstone.services.store.StreamRepository;
-import org.apache.james.core.MimeMessageUtil;
import org.apache.mailet.Mail;
+import org.apache.mailet.MimeMessageUtil;
import javax.mail.MessagingException;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/JamesMailetLoader.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/JamesMailetLoader.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/JamesMailetLoader.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/JamesMailetLoader.java Tue Oct 31 09:02:05 2006
@@ -23,8 +23,10 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+
import org.apache.james.core.MailetConfigImpl;
import org.apache.james.services.MailetLoader;
+
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetException;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/Loader.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/Loader.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/Loader.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/Loader.java Tue Oct 31 09:02:05 2006
@@ -38,7 +38,10 @@
import org.apache.james.services.FileSystem;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailFactory;
+import org.apache.mailet.MailRepository;
import org.apache.mailet.MailetContext;
+import org.apache.mailet.MailetException;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
@@ -291,6 +294,23 @@
*/
public void storeMail(MailAddress sender, MailAddress recipient, MimeMessage msg) throws MessagingException {
mailetContext.storeMail(sender, recipient, msg);
+ }
+
+ /**
+ * @see org.apache.mailet.MailetContext#getMailRepository(java.lang.String)
+ */
+ public MailRepository getMailRepository(String repoURL) throws MailetException {
+
+
+ return mailetContext.getMailRepository(repoURL);
+ }
+
+ /**
+ * @see org.apache.mailet.MailetContext#getMailFactory()
+ */
+ public MailFactory getMailFactory() {
+
+ return mailetContext.getMailFactory();
}
}
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractAddFooter.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractAddFooter.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractAddFooter.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractAddFooter.java Tue Oct 31 09:02:05 2006
@@ -21,18 +21,16 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.RFC2822Headers;
-
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimePart;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.RFC2822Headers;
/**
* An abstract implementation of a mailet that add a Footer to an email
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractNotify.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractNotify.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractNotify.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractNotify.java Tue Oct 31 09:02:05 2006
@@ -21,17 +21,16 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Collection;
import java.util.Iterator;
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.RFC2822Headers;
/**
* <P>Abstract mailet providing configurable notification services.<BR>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractRedirect.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractRedirect.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractRedirect.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractRedirect.java Tue Oct 31 09:02:05 2006
@@ -23,33 +23,27 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
-import java.util.ArrayList;
-
-
import javax.mail.Message;
import javax.mail.MessagingException;
-import javax.mail.internet.ParseException;
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.dates.RFC822DateFormat;
-import org.apache.james.core.MailImpl;
-import org.apache.james.core.MimeMessageUtil;
-
+import javax.mail.internet.ParseException;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MimeMessageUtil;
+import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.dates.RFC822DateFormat;
/**
@@ -689,7 +683,7 @@
* If the requested value is null does nothing.
* Is a "setX(Mail, Tx, Mail)" method.
*/
- protected void setReversePath(MailImpl newMail, MailAddress reversePath, Mail originalMail) throws MessagingException {
+ protected void setReversePath(Mail newMail, MailAddress reversePath, Mail originalMail) throws MessagingException {
if(reversePath != null) {
if (reversePath == SpecialAddress.NULL) {
reversePath = null;
@@ -977,7 +971,7 @@
boolean keepMessageId = false;
// duplicates the Mail object, to be able to modify the new mail keeping the original untouched
- MailImpl newMail = new MailImpl(originalMail);
+ Mail newMail =getMailetContext().getMailFactory().newMail(originalMail);
try {
// We don't need to use the original Remote Address and Host,
// and doing so would likely cause a loop with spam detecting
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java Tue Oct 31 09:02:05 2006
@@ -21,16 +21,6 @@
package org.apache.james.transport.mailets;
-import org.apache.james.core.MailImpl;
-import org.apache.james.util.VirtualUserTableUtil;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-import org.apache.oro.text.regex.MalformedPatternException;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.ParseException;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -38,6 +28,13 @@
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
+import javax.mail.MessagingException;
+import javax.mail.internet.ParseException;
+import org.apache.james.util.VirtualUserTableUtil;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.oro.text.regex.MalformedPatternException;
/**
* Provides an abstraction of common functionality needed for implementing
@@ -162,7 +159,7 @@
// getMailetContext().sendMail(mail.getSender(), recipientsToAddForward, mail.getMessage());
// duplicates the Mail object, to be able to modify the new mail keeping the original untouched
- MailImpl newMail = new MailImpl(mail);
+ Mail newMail = getMailetContext().getMailFactory().newMail(mail);
try {
try {
newMail.setRemoteAddr(java.net.InetAddress.getLocalHost().getHostAddress());
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddFooter.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddFooter.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddFooter.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddFooter.java Tue Oct 31 09:02:05 2006
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets;
-import javax.mail.MessagingException;
import java.util.StringTokenizer;
+import javax.mail.MessagingException;
/**
* This mailet will attach text to the end of the message (like a footer). Right
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java Tue Oct 31 09:02:05 2006
@@ -22,8 +22,8 @@
package org.apache.james.transport.mailets;
import org.apache.james.transport.matchers.HasHabeasWarrantMark;
-import org.apache.mailet.GenericMailet ;
-import org.apache.mailet.Mail ;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
/*
* This matcher adds the Hebeas Warrant Mark to a message.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddSubjectPrefix.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddSubjectPrefix.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddSubjectPrefix.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AddSubjectPrefix.java Tue Oct 31 09:02:05 2006
@@ -23,7 +23,6 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.RFC2822Headers;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java Tue Oct 31 09:02:05 2006
@@ -21,17 +21,16 @@
package org.apache.james.transport.mailets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import javax.mail.internet.ParseException;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
import org.apache.james.services.UsersStore;
import org.apache.mailet.MailAddress;
import org.apache.mailet.UsersRepository;
-
-import javax.mail.internet.ParseException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ArrayList;
/**
* MailingListServer capability.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysis.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysis.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysis.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysis.java Tue Oct 31 09:02:05 2006
@@ -21,6 +21,15 @@
package org.apache.james.transport.mailets;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.StringReader;
+import java.sql.Connection;
+import java.text.DecimalFormat;
+import java.util.Collection;
+import java.util.Iterator;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
@@ -30,18 +39,6 @@
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.RFC2822Headers;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.StringReader;
-import java.sql.Connection;
-import java.text.DecimalFormat;
-import java.util.Collection;
-import java.util.Iterator;
/**
* <P>Spam detection mailet using bayesian analysis techniques.</P>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java Tue Oct 31 09:02:05 2006
@@ -22,25 +22,21 @@
package org.apache.james.transport.mailets;
import java.io.BufferedReader;
-import java.io.StringReader;
import java.io.ByteArrayOutputStream;
-
+import java.io.StringReader;
import java.sql.Connection;
import java.util.Enumeration;
-
-import javax.mail.internet.MimeMessage;
import javax.mail.Header;
import javax.mail.MessagingException;
-
+import javax.mail.internet.MimeMessage;
import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
+import org.apache.james.util.JDBCBayesianAnalyzer;
+import org.apache.james.util.JDBCUtil;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
-import org.apache.james.util.JDBCUtil;
-
-import org.apache.james.util.JDBCBayesianAnalyzer;
/**
* <P>Feeds ham OR spam messages to train the {@link BayesianAnalysis} mailet.</P>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Bounce.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Bounce.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Bounce.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Bounce.java Tue Oct 31 09:02:05 2006
@@ -23,10 +23,8 @@
import java.util.Collection;
import java.util.HashSet;
-
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
-
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservFooter.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservFooter.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservFooter.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservFooter.java Tue Oct 31 09:02:05 2006
@@ -21,6 +21,7 @@
package org.apache.james.transport.mailets;
+import javax.mail.MessagingException;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.james.util.XMLResources;
import org.apache.oro.text.regex.MalformedPatternException;
@@ -29,8 +30,6 @@
import org.apache.oro.text.regex.Perl5Matcher;
import org.apache.oro.text.regex.StringSubstitution;
import org.apache.oro.text.regex.Util;
-
-import javax.mail.MessagingException;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java Tue Oct 31 09:02:05 2006
@@ -21,9 +21,19 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.framework.service.ServiceManager;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import javax.mail.MessagingException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
import org.apache.james.services.UsersStore;
import org.apache.james.transport.mailets.listservcommands.ErrorCommand;
@@ -33,17 +43,6 @@
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.UsersRepository;
-
-import javax.mail.MessagingException;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
/**
* CommandListservManager is the default implementation of {@link ICommandListservManager}.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java Tue Oct 31 09:02:05 2006
@@ -21,29 +21,28 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.framework.service.ServiceManager;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import javax.mail.internet.ParseException;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
import org.apache.james.services.UsersStore;
-import org.apache.mailet.RFC2822Headers;
import org.apache.james.util.XMLResources;
-import org.apache.james.util.mailet.MailetUtil;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
+import org.apache.mailet.MailetUtil;
+import org.apache.mailet.RFC2822Headers;
import org.apache.mailet.UsersRepository;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.ParseException;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Properties;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/DSNBounce.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/DSNBounce.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/DSNBounce.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/DSNBounce.java Tue Oct 31 09:02:05 2006
@@ -21,8 +21,23 @@
package org.apache.james.transport.mailets;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import javax.mail.MessagingException;
+import javax.mail.SendFailedException;
+import javax.mail.Session;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
import org.apache.james.Constants;
-import org.apache.james.core.MailImpl;
import org.apache.james.util.mail.MimeMultipartReport;
import org.apache.james.util.mail.dsn.DSNStatus;
import org.apache.mailet.Mail;
@@ -35,24 +50,6 @@
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
-import javax.mail.MessagingException;
-import javax.mail.SendFailedException;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-
@@ -147,7 +144,7 @@
// duplicates the Mail object, to be able to modify the new mail keeping the original untouched
- MailImpl newMail = new MailImpl(originalMail);
+ Mail newMail = getMailetContext().getMailFactory().newMail(originalMail);
try {
// We don't need to use the original Remote Address and Host,
// and doing so would likely cause a loop with spam detecting
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Forward.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Forward.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Forward.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Forward.java Tue Oct 31 09:02:05 2006
@@ -21,12 +21,11 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.MailAddress;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
import java.util.Collection;
import java.util.HashSet;
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import org.apache.mailet.MailAddress;
/**
* <P>Replaces incoming recipients with those specified, and resends the message unaltered.</P>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java Tue Oct 31 09:02:05 2006
@@ -21,19 +21,13 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import java.util.Iterator;
+import javax.mail.MessagingException;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.james.Constants;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailRepository;
-
-import javax.mail.MessagingException;
-
-import java.util.Iterator;
+import org.apache.mailet.MailetException;
/**
* Re-spools Mail found in the specified Repository.
@@ -80,21 +74,20 @@
} catch (Exception e) {
// Ignore exception, default to false
}
-
- ServiceManager compMgr = (ServiceManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
+
+
try {
- Store mailstore = (Store) compMgr.lookup(Store.ROLE);
- DefaultConfiguration mailConf
- = new DefaultConfiguration("repository", "generated:ToRepository");
- mailConf.setAttribute("destinationURL", repositoryPath);
- mailConf.setAttribute("type", "MAIL");
- repository = (MailRepository) mailstore.select(mailConf);
- } catch (ServiceException cnfe) {
+
+ repository = getMailetContext().getMailRepository(repositoryPath);
+
+ } catch (MailetException cnfe) {
log("Failed to retrieve Store component:" + cnfe.getMessage());
} catch (Exception e) {
log("Failed to retrieve Store component:" + e.getMessage());
}
}
+
+
/**
* Spool mail from a particular repository.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListserv.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListserv.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListserv.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListserv.java Tue Oct 31 09:02:05 2006
@@ -21,18 +21,17 @@
package org.apache.james.transport.mailets;
-import org.apache.james.util.mailet.MailetUtil;
-import org.apache.mailet.RFC2822Headers;
+import java.io.IOException;
+import java.util.Collection;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import java.io.IOException;
-import java.util.Collection;
+import org.apache.mailet.MailetUtil;
+import org.apache.mailet.RFC2822Headers;
/**
* An abstract implementation of a listserv. The underlying implementation must define
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListservManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListservManager.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListservManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/GenericListservManager.java Tue Oct 31 09:02:05 2006
@@ -21,11 +21,10 @@
package org.apache.james.transport.mailets;
+import javax.mail.MessagingException;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
-
-import javax.mail.MessagingException;
/**
* An abstract implementation of a listserv manager. This mailet reads the
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java Tue Oct 31 09:02:05 2006
@@ -21,17 +21,16 @@
package org.apache.james.transport.mailets;
+import java.util.Map;
+import java.util.Properties;
+import javax.mail.MessagingException;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.james.transport.mailets.listservcommands.IListServCommand;
import org.apache.james.util.XMLResources;
-import org.apache.mailet.Mailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.Mailet;
import org.apache.mailet.UsersRepository;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import javax.mail.MessagingException;
-import java.util.Map;
-import java.util.Properties;
/**
* ICommandListservManager is the interface that describes the functionality of any
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCAlias.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCAlias.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCAlias.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCAlias.java Tue Oct 31 09:02:05 2006
@@ -21,6 +21,16 @@
package org.apache.james.transport.mailets;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
+import javax.mail.MessagingException;
+import javax.mail.internet.ParseException;
import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
@@ -30,18 +40,6 @@
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.ParseException;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Vector;
/**
* Rewrites recipient addresses based on a database table. The connection
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCListserv.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCListserv.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCListserv.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCListserv.java Tue Oct 31 09:02:05 2006
@@ -21,17 +21,6 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.james.Constants;
-import org.apache.james.util.JDBCUtil;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailetException;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.ParseException;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
@@ -40,6 +29,15 @@
import java.sql.Statement;
import java.util.Collection;
import java.util.Vector;
+import javax.mail.MessagingException;
+import javax.mail.internet.ParseException;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.james.Constants;
+import org.apache.james.util.JDBCUtil;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetException;
/**
* Rewrites recipient addresses based on a database table. The connection
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java Tue Oct 31 09:02:05 2006
@@ -21,17 +21,6 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
-import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.james.Constants;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.VirtualUserTableUtil;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailetException;
-
-import javax.mail.MessagingException;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
@@ -40,6 +29,15 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
+import javax.mail.MessagingException;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
+import org.apache.avalon.excalibur.datasource.DataSourceComponent;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.james.Constants;
+import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.VirtualUserTableUtil;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailetException;
/**
* Implements a Virtual User Table for JAMES. Derived from the
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LocalDelivery.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LocalDelivery.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LocalDelivery.java Tue Oct 31 09:02:05 2006
@@ -21,17 +21,15 @@
package org.apache.james.transport.mailets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import javax.mail.MessagingException;
import org.apache.commons.collections.iterators.IteratorChain;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetConfig;
import org.apache.mailet.MailetContext;
-
-import javax.mail.MessagingException;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
/**
* Receives a Mail from JamesSpoolManager and takes care of delivery of the
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LogMessage.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LogMessage.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LogMessage.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/LogMessage.java Tue Oct 31 09:02:05 2006
@@ -21,17 +21,13 @@
package org.apache.james.transport.mailets;
+import java.io.InputStream;
import java.util.Enumeration;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-
-import org.apache.james.core.MailImpl;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
-import java.io.InputStream;
-import java.lang.StringBuffer;
-
/**
* Logs Message Headers and/or Body.
* If the "passThrough" in confs is true the mail will be left untouched in
@@ -69,10 +65,10 @@
/**
* Log a particular message
*
- * @param genericmail the mail to process
+ * @param mail the mail to process
*/
- public void service(Mail genericmail) {
- MailImpl mail = (MailImpl)genericmail;
+ public void service(Mail mail) {
+
log(new StringBuffer(160).append("Logging mail ").append(mail.getName()).toString());
if (comment != null) log(comment);
try {
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java Tue Oct 31 09:02:05 2006
@@ -24,10 +24,8 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.StringTokenizer;
-
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java Tue Oct 31 09:02:05 2006
@@ -21,12 +21,11 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.MailAddress;
-
+import java.util.Collection;
+import java.util.HashSet;
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
-import java.util.HashSet;
-import java.util.Collection;
+import org.apache.mailet.MailAddress;
/**
* <P>Sends a notification message to the Postmaster.</P>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifySender.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifySender.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifySender.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/NotifySender.java Tue Oct 31 09:02:05 2006
@@ -21,12 +21,11 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.MailAddress;
-
+import java.util.Collection;
+import java.util.HashSet;
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
-import java.util.HashSet;
-import java.util.Collection;
+import org.apache.mailet.MailAddress;
/**
* <P>Sends a notification message to the sender of a message.</P>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/OnlyText.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/OnlyText.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/OnlyText.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/OnlyText.java Tue Oct 31 09:02:05 2006
@@ -19,18 +19,16 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailetException;
-
+import java.io.IOException;
+import java.util.HashMap;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Part;
import javax.mail.internet.ContentType;
-
-import java.io.IOException;
-import java.util.HashMap;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailetException;
/**
* Keep only the text part of a message.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/PostmasterAlias.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/PostmasterAlias.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/PostmasterAlias.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/PostmasterAlias.java Tue Oct 31 09:02:05 2006
@@ -21,15 +21,14 @@
package org.apache.james.transport.mailets;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
+import javax.mail.MessagingException;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
-
-import javax.mail.MessagingException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Vector;
/**
* Rewrites recipient addresses to make sure email for the postmaster is
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Redirect.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Redirect.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Redirect.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/Redirect.java Tue Oct 31 09:02:05 2006
@@ -23,11 +23,8 @@
import java.util.Collection;
import java.util.HashSet;
-
-
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
-
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDelivery.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDelivery.java Tue Oct 31 09:02:05 2006
@@ -21,6 +21,33 @@
package org.apache.james.transport.mailets;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.Vector;
+import javax.mail.Address;
+import javax.mail.MessagingException;
+import javax.mail.SendFailedException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import javax.mail.internet.MimePart;
+import javax.mail.internet.ParseException;
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.container.ContainerUtil;
@@ -40,40 +67,10 @@
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
-
import com.sun.mail.smtp.SMTPAddressFailedException;
import com.sun.mail.smtp.SMTPAddressSucceededException;
import com.sun.mail.smtp.SMTPSendFailedException;
import com.sun.mail.smtp.SMTPTransport;
-
-import javax.mail.Address;
-import javax.mail.MessagingException;
-import javax.mail.SendFailedException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.MimePart;
-import javax.mail.internet.ParseException;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.Vector;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java Tue Oct 31 09:02:05 2006
@@ -21,13 +21,12 @@
package org.apache.james.transport.mailets;
-import javax.net.SocketFactory;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.UnknownHostException;
+import javax.net.SocketFactory;
/**
* It is used by RemoteDelivery in order to make possible to bind the client
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java Tue Oct 31 09:02:05 2006
@@ -21,9 +21,9 @@
package org.apache.james.transport.mailets;
+import javax.mail.MessagingException;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
-import javax.mail.MessagingException;
/**
* This mailet sets removes all attributes set on the Mail instance
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMailAttribute.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMailAttribute.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMailAttribute.java Tue Oct 31 09:02:05 2006
@@ -21,13 +21,13 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailetException;
-import java.util.Iterator;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.StringTokenizer;
import javax.mail.MessagingException;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailetException;
/**
* This mailet sets attributes on the Mail.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMimeHeader.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMimeHeader.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMimeHeader.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/RemoveMimeHeader.java Tue Oct 31 09:02:05 2006
@@ -23,10 +23,8 @@
import java.util.ArrayList;
import java.util.StringTokenizer;
-
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetException;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ReplaceContent.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ReplaceContent.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ReplaceContent.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ReplaceContent.java Tue Oct 31 09:02:05 2006
@@ -19,14 +19,6 @@
package org.apache.james.transport.mailets;
-import org.apache.james.util.mailet.StringUtils;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailetException;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.ContentType;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -37,6 +29,12 @@
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
+import javax.mail.MessagingException;
+import javax.mail.internet.ContentType;
+import org.apache.james.util.mailet.StringUtils;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailetException;
/**
* Replace text contents
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ServerTime.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ServerTime.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ServerTime.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ServerTime.java Tue Oct 31 09:02:05 2006
@@ -21,11 +21,11 @@
package org.apache.james.transport.mailets;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
-
-import javax.mail.internet.MimeMessage;
/**
* Returns the current time for the mail server. Sample configuration:
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMailAttribute.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMailAttribute.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMailAttribute.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMailAttribute.java Tue Oct 31 09:02:05 2006
@@ -21,15 +21,15 @@
package org.apache.james.transport.mailets;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailetException;
import java.io.Serializable;
-import java.util.Iterator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import javax.mail.MessagingException;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailetException;
/**
* This mailet sets attributes on the Mail.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMimeHeader.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMimeHeader.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMimeHeader.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SetMimeHeader.java Tue Oct 31 09:02:05 2006
@@ -22,10 +22,9 @@
package org.apache.james.transport.mailets;
import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage ;
-
-import org.apache.mailet.GenericMailet ;
-import org.apache.mailet.Mail ;
+import javax.mail.internet.MimeMessage;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
/**
* Adds a specified header and value to the message.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SpamAssassin.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SpamAssassin.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SpamAssassin.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/SpamAssassin.java Tue Oct 31 09:02:05 2006
@@ -21,13 +21,11 @@
package org.apache.james.transport.mailets;
import java.util.Iterator;
-
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
import org.apache.james.util.SpamAssassinInvoker;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
/**
* Sends the message through daemonized SpamAssassin (spamd), visit <a
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java Tue Oct 31 09:02:05 2006
@@ -21,30 +21,20 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.james.Constants;
-import org.apache.james.James;
-import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailServer;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailRepository;
-import org.apache.mailet.RFC2822Headers;
-
-import javax.mail.Header;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetHeaders;
-import javax.mail.internet.MimeMessage;
-
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Vector;
+import javax.mail.Header;
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeMessage;
+import org.apache.mailet.GenericMailet;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
+import org.apache.mailet.RFC2822Headers;
/**
* Receives a Mail from JamesSpoolManager and takes care of delivery of the
@@ -73,15 +63,8 @@
*/
private static long count;
- /**
- * The mailserver reference
- */
- private MailServer mailServer;
-
- /**
- * The mailstore
- */
- private Store store;
+
+
/**
* The optional repositoryUrl
@@ -218,9 +201,9 @@
Collection recipients = new HashSet();
recipients.add(recipient);
- MailImpl mail = new MailImpl(getId(), sender, recipients, message);
+ Mail mail = getMailetContext().getMailFactory().newMail(getId(), sender, recipients, message);
try {
- MailRepository userInbox = getRepository(username);
+ MailRepository userInbox = getMailetContext().getMailRepository(username);
if (userInbox == null) {
StringBuffer errorBuffer = new StringBuffer(128).append(
"The repository for user ").append(username).append(
@@ -240,7 +223,7 @@
*/
public String getId() {
long localCount = -1;
- synchronized (James.class) {
+ synchronized (ToMultiRepository.class) {
localCount = count++;
}
StringBuffer idBuffer = new StringBuffer(64).append("Mail").append(
@@ -253,35 +236,14 @@
*/
public void init() throws MessagingException {
super.init();
- ServiceManager compMgr = (ServiceManager) getMailetContext()
- .getAttribute(Constants.AVALON_COMPONENT_MANAGER);
-
- try {
- // Instantiate the a MailRepository for outgoing mails
- store = (Store) compMgr.lookup(Store.ROLE);
- } catch (ServiceException cnfe) {
- log("Failed to retrieve Store component:" + cnfe.getMessage());
- } catch (Exception e) {
- log("Failed to retrieve Store component:" + e.getMessage());
- }
+
repositoryUrl = getInitParameter("repositoryUrl");
if (repositoryUrl != null) {
repositoryType = getInitParameter("repositoryType");
if (repositoryType == null)
repositoryType = "MAIL";
- } else {
-
- try {
- // Instantiate the a MailRepository for outgoing mails
- mailServer = (MailServer) compMgr.lookup(MailServer.ROLE);
- } catch (ServiceException cnfe) {
- log("Failed to retrieve MailServer component:" + cnfe.getMessage());
- } catch (Exception e) {
- log("Failed to retrieve MailServer component:" + e.getMessage());
- }
-
- }
+ }
deliveryHeader = getInitParameter("addDeliveryHeader");
String resetReturnPathString = getInitParameter("resetReturnPath");
@@ -296,26 +258,6 @@
* @param userName
* @return
*/
- private MailRepository getRepository(String userName) {
- MailRepository userInbox;
- if (repositoryUrl == null) {
- userInbox = mailServer.getUserInbox(userName);
- } else {
- StringBuffer destinationBuffer = new StringBuffer(192).append(
- repositoryUrl).append(userName).append("/");
- String destination = destinationBuffer.toString();
- DefaultConfiguration mboxConf = new DefaultConfiguration(
- "repository", "generated:ToMultiRepository.getUserInbox()");
- mboxConf.setAttribute("destinationURL", destination);
- mboxConf.setAttribute("type", repositoryType);
- try {
- userInbox = (MailRepository) store.select(mboxConf);
- } catch (Exception e) {
- log("Cannot open repository " + e);
- userInbox = null;
- }
- }
- return userInbox;
- }
+
}
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToProcessor.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToProcessor.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToProcessor.java Tue Oct 31 09:02:05 2006
@@ -21,11 +21,10 @@
package org.apache.james.transport.mailets;
+import javax.mail.MessagingException;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetException;
-
-import javax.mail.MessagingException;
/**
* This mailet redirects the mail to the named processor
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java?view=diff&rev=469558&r1=469557&r2=469558
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java Tue Oct 31 09:02:05 2006
@@ -21,14 +21,11 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.james.Constants;
+
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailRepository;
+import org.apache.mailet.MailetException;
/**
* Stores incoming Mail in the specified Repository.
@@ -67,17 +64,13 @@
// Ignore exception, default to false
}
- ServiceManager compMgr = (ServiceManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
- try {
- Store mailstore = (Store) compMgr.lookup(Store.ROLE);
- DefaultConfiguration mailConf
- = new DefaultConfiguration("repository", "generated:ToRepository");
- mailConf.setAttribute("destinationURL", repositoryPath);
- mailConf.setAttribute("type", "MAIL");
- mailConf.setAttribute("CACHEKEYS", getInitParameter("CACHEKEYS","TRUE"));
- repository = (MailRepository) mailstore.select(mailConf);
- } catch (ServiceException cnfe) {
- log("Failed to retrieve Store component:" + cnfe.getMessage());
+
+
+ try{
+ getMailetContext().getMailRepository(repositoryPath);
+ }catch (MailetException e){
+ log("Failed to retrieve repository:" + e.getMessage());
+
} catch (Exception e) {
log("Failed to retrieve Store component:" + e.getMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org