james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r717869 - in /james/server/trunk: ./ core-function/src/test/java/org/apache/james/management/impl/ core-library/src/main/java/org/apache/james/core/ core-library/src/test/java/org/apache/james/core/ core-library/src/test/java/org/apache/jam...
Date Sat, 15 Nov 2008 15:56:19 GMT
Author: rdonkin
Date: Sat Nov 15 07:56:18 2008
New Revision: 717869

URL: http://svn.apache.org/viewvc?rev=717869&view=rev
Log:
Updated to latest mailet base with new package names.

Added:
    james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT-tests.jar   (with props)
    james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar   (with props)
    james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar   (with props)
    james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar   (with props)
Removed:
    james/server/trunk/stage/org.apache.james/jars/apache-james-mailet-base-1.0-SNAPSHOT-tests.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-mailet-base-1.0-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/standard-mailets-1.0-SNAPSHOT-tests.jar
    james/server/trunk/stage/org.apache.james/jars/standard-mailets-1.0-SNAPSHOT.jar
Modified:
    james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
    james/server/trunk/core-library/src/main/java/org/apache/james/core/MailHeaders.java
    james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java
    james/server/trunk/core-library/src/test/java/org/apache/james/core/MailHeadersTest.java
    james/server/trunk/core-library/src/test/java/org/apache/james/core/MailImplTest.java
    james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java
    james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
    james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
    james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
    james/server/trunk/include.properties
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractNotify.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListserv.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SPF.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
    james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java
    james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
    james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
    james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
    james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
    james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
    james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java
    james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
    james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
    james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
    james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
    james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/MailetLoaderTestMailet.java

Modified: james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java Sat Nov 15 07:56:18 2008
@@ -30,9 +30,9 @@
 import org.apache.james.test.mock.avalon.MockServiceManager;
 import org.apache.james.test.mock.avalon.MockStore;
 import org.apache.james.test.mock.james.InMemorySpoolRepository;
-import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MockMimeMessage;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/server/trunk/core-library/src/main/java/org/apache/james/core/MailHeaders.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MailHeaders.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/core/MailHeaders.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/core/MailHeaders.java Sat Nov 15 07:56:18 2008
@@ -31,7 +31,7 @@
 import java.io.Serializable;
 import java.util.Enumeration;
 
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 /**
  * This interface defines a container for mail headers. Each header must use

Modified: james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java Sat Nov 15 07:56:18 2008
@@ -25,7 +25,7 @@
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.InternetAddress;

Modified: james/server/trunk/core-library/src/test/java/org/apache/james/core/MailHeadersTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/core/MailHeadersTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/core/MailHeadersTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/core/MailHeadersTest.java Sat Nov 15 07:56:18 2008
@@ -20,7 +20,7 @@
 
 package org.apache.james.core;
 
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.MessagingException;
 

Modified: james/server/trunk/core-library/src/test/java/org/apache/james/core/MailImplTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/core/MailImplTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/core/MailImplTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/core/MailImplTest.java Sat Nov 15 07:56:18 2008
@@ -21,8 +21,8 @@
 
 package org.apache.james.core;
 
-import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MockMimeMessage;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mail;
 

Modified: james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java Sat Nov 15 07:56:18 2008
@@ -20,7 +20,7 @@
 package org.apache.james.core;
 
 import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.BodyPart;
 import javax.mail.Session;

Modified: james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java Sat Nov 15 07:56:18 2008
@@ -20,7 +20,7 @@
 package org.apache.james.core;
 
 import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;

Modified: james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java Sat Nov 15 07:56:18 2008
@@ -25,7 +25,7 @@
 import org.apache.james.core.MailImpl;
 import org.apache.james.services.MailRepository;
 import org.apache.james.services.MailServer;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java Sat Nov 15 07:56:18 2008
@@ -36,7 +36,7 @@
 import javax.mail.internet.ParseException;
 
 import org.apache.james.core.MailImpl;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Sat Nov 15 07:56:18 2008
@@ -264,13 +264,13 @@
 # ----- mailet-----
 jarname.mailet.jar=apache-mailet-2.4-SNAPSHOT.jar
 mailet.jar=${path.lib.james}/${jarname.mailet.jar}
-jarname.base-mailet.jar=apache-james-mailet-base-1.0-SNAPSHOT.jar
+jarname.base-mailet.jar=apache-mailet-base-1.0-SNAPSHOT.jar
 base-mailet.jar=${path.lib.james}/${jarname.base-mailet.jar}
-jarname.base-mailet.tests.jar=apache-james-mailet-base-1.0-SNAPSHOT-tests.jar
+jarname.base-mailet.tests.jar=apache-mailet-base-1.0-SNAPSHOT-tests.jar
 base-mailet.tests.jar=${path.lib.james}/${jarname.base-mailet.tests.jar}
-jarname.std-mailet.jar=standard-mailets-1.0-SNAPSHOT.jar
+jarname.std-mailet.jar=apache-james-standard-mailets-1.0-SNAPSHOT.jar
 std-mailet.jar=${path.lib.james}/${jarname.std-mailet.jar}
-jarname.std-mailet.tests.jar=standard-mailets-1.0-SNAPSHOT-tests.jar
+jarname.std-mailet.tests.jar=apache-james-standard-mailets-1.0-SNAPSHOT-tests.jar
 std-mailet.tests.jar=${path.lib.james}/${jarname.std-mailet.tests.jar}
 jarname.commons-io.jar=commons-io-1.2.jar
 commons-io.jar=${path.lib.commonsio}/${jarname.commons-io.jar}

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractNotify.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractNotify.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractNotify.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractNotify.java Sat Nov 15 07:56:18 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractRedirect.java Sat Nov 15 07:56:18 2008
@@ -42,13 +42,13 @@
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.dates.RFC822DateFormat;
+import org.apache.mailet.base.RFC2822Headers;
+import org.apache.mailet.base.RFC822DateFormat;
 import org.apache.james.Constants;
 import org.apache.james.core.MailImpl;
 import org.apache.james.core.MimeMessageUtil;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java Sat Nov 15 07:56:18 2008
@@ -24,7 +24,7 @@
 import org.apache.james.Constants;
 import org.apache.james.core.MailImpl;
 import org.apache.james.impl.vut.VirtualUserTableUtil;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.oro.text.regex.MalformedPatternException;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java Sat Nov 15 07:56:18 2008
@@ -27,9 +27,9 @@
 import org.apache.james.Constants;
 import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
 import org.apache.james.util.sql.JDBCUtil;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java Sat Nov 15 07:56:18 2008
@@ -36,7 +36,7 @@
 import org.apache.avalon.excalibur.datasource.DataSourceComponent;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.Constants;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java Sat Nov 15 07:56:18 2008
@@ -30,7 +30,7 @@
 import org.apache.james.transport.mailets.listservcommands.ErrorCommand;
 import org.apache.james.transport.mailets.listservcommands.IListServCommand;
 import org.apache.james.util.XMLResources;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java Sat Nov 15 07:56:18 2008
@@ -26,10 +26,10 @@
 import org.apache.james.Constants;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.user.UsersStore;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 import org.apache.james.util.XMLResources;
-import org.apache.james.util.mailet.MailetUtil;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.MailetUtil;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.MailetException;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/DSNBounce.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/DSNBounce.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/DSNBounce.java Sat Nov 15 07:56:18 2008
@@ -27,8 +27,8 @@
 import org.apache.james.util.mail.MimeMultipartReport;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.dates.RFC822DateFormat;
+import org.apache.mailet.base.RFC2822Headers;
+import org.apache.mailet.base.RFC822DateFormat;
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.MatchResult;
 import org.apache.oro.text.regex.Pattern;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java Sat Nov 15 07:56:18 2008
@@ -28,7 +28,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.Constants;
 import org.apache.james.services.MailRepository;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListserv.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListserv.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListserv.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListserv.java Sat Nov 15 07:56:18 2008
@@ -21,9 +21,9 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.mailet.MailetUtil;
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.MailetUtil;
+import org.apache.mailet.base.RFC2822Headers;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.MailetException;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java Sat Nov 15 07:56:18 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java Sat Nov 15 07:56:18 2008
@@ -26,7 +26,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.Constants;
 import org.apache.james.util.sql.JDBCUtil;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.MailetException;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Sat Nov 15 07:56:18 2008
@@ -31,7 +31,7 @@
 import org.apache.james.api.dnsservice.TemporaryResolutionException;
 import org.apache.james.services.SpoolRepository;
 import org.apache.james.util.TimeConverter;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.HostAddress;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java Sat Nov 15 07:56:18 2008
@@ -26,7 +26,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.Constants;
 import org.apache.james.services.SpoolRepository;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetContext;
 import org.apache.oro.text.regex.MalformedPatternException;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SPF.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SPF.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SPF.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SPF.java Sat Nov 15 07:56:18 2008
@@ -25,7 +25,7 @@
 import org.apache.james.jspf.core.Logger;
 import org.apache.james.jspf.executor.SPFResult;
 import org.apache.james.jspf.impl.DefaultSPF;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java Sat Nov 15 07:56:18 2008
@@ -23,7 +23,7 @@
 import java.util.Iterator;
 
 import org.apache.james.util.scanner.SpamAssassinInvoker;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java Sat Nov 15 07:56:18 2008
@@ -27,7 +27,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.Constants;
 import org.apache.james.services.MailRepository;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java Sat Nov 15 07:56:18 2008
@@ -29,11 +29,11 @@
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.util.sql.JDBCUtil;
 import org.apache.james.util.sql.SqlResources;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.dates.RFC822DateFormat;
+import org.apache.mailet.base.RFC2822Headers;
+import org.apache.mailet.base.RFC822DateFormat;
 
 import javax.mail.Message;
 import javax.mail.MessagingException;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java Sat Nov 15 07:56:18 2008
@@ -25,7 +25,7 @@
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.transport.mailets.ICommandListservManager;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 import org.apache.james.util.XMLResources;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java Sat Nov 15 07:56:18 2008
@@ -50,7 +50,7 @@
   * 
   * @version $ID$
   */
-public abstract class AbstractNetworkMatcher extends org.apache.mailet.GenericMatcher {
+public abstract class AbstractNetworkMatcher extends org.apache.mailet.base.GenericMatcher {
 
     /**
      * This is a Network Matcher that should be configured to contain

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java Sat Nov 15 07:56:18 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java Sat Nov 15 07:56:18 2008
@@ -22,7 +22,7 @@
 package org.apache.james.transport.matchers;
 
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MatcherConfig;
 import java.util.Collection;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java Sat Nov 15 07:56:18 2008
@@ -31,7 +31,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.Constants;
 import org.apache.james.api.dnsservice.DNSService;
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java Sat Nov 15 07:56:18 2008
@@ -30,7 +30,7 @@
 import org.apache.james.transport.mailets.WhiteListManager;
 import org.apache.james.util.sql.JDBCUtil;
 import org.apache.james.util.sql.SqlResources;
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java Sat Nov 15 07:56:18 2008
@@ -23,7 +23,7 @@
 
 import javax.mail.MessagingException;
 
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 import org.apache.oro.text.regex.MalformedPatternException;
 
 /**

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java Sat Nov 15 07:56:18 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.base.GenericRecipientMatcher;
 import org.apache.mailet.MailAddress;
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;

Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java Sat Nov 15 07:56:18 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.oro.text.regex.MalformedPatternException;

Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java Sat Nov 15 07:56:18 2008
@@ -1,5 +1,6 @@
 package org.apache.james.samples.mailets;
 
+
 /*
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java Sat Nov 15 07:56:18 2008
@@ -40,8 +40,8 @@
 import org.apache.james.api.dnsservice.AbstractDNSServer;
 import org.apache.james.api.dnsservice.DNSService;
 import org.apache.james.test.mock.avalon.MockServiceManager;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java Sat Nov 15 07:56:18 2008
@@ -20,7 +20,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 
 import javax.mail.MessagingException;
 import java.util.Collection;

Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java Sat Nov 15 07:56:18 2008
@@ -24,9 +24,9 @@
 import org.apache.james.api.dnsservice.AbstractDNSServer;
 import org.apache.james.api.dnsservice.DNSService;
 import org.apache.james.test.mock.avalon.MockServiceManager;
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
 
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Matcher;

Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java Sat Nov 15 07:56:18 2008
@@ -21,12 +21,12 @@
 package org.apache.james.transport.matchers;
 
 import junit.framework.TestCase;
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Matcher;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;

Modified: james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java (original)
+++ james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/TesterMailetConfig.java Sat Nov 15 07:56:18 2008
@@ -25,7 +25,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.Constants;
 import org.apache.james.services.SpoolRepository;
-import org.apache.james.test.mock.mailet.MockMailContext;
+import org.apache.mailet.base.test.MockMailContext;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.MailetConfig;

Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java Sat Nov 15 07:56:18 2008
@@ -29,9 +29,9 @@
 import org.apache.james.util.stream.CharTerminatedInputStream;
 import org.apache.james.util.stream.DotStuffingInputStream;
 import org.apache.james.util.stream.ExtraDotOutputStream;
-import org.apache.mailet.dates.RFC2980DateFormat;
-import org.apache.mailet.dates.RFC977DateFormat;
-import org.apache.mailet.dates.SimplifiedDateFormat;
+import org.apache.mailet.base.RFC2980DateFormat;
+import org.apache.mailet.base.RFC977DateFormat;
+import org.apache.mailet.base.SimplifiedDateFormat;
 
 import javax.mail.MessagingException;
 

Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java Sat Nov 15 07:56:18 2008
@@ -36,8 +36,8 @@
 import org.apache.james.test.mock.avalon.MockThreadManager;
 import org.apache.james.test.mock.james.InMemorySpoolRepository;
 import org.apache.james.test.mock.james.MockMailServer;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMailetConfig;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
 import org.apache.james.test.util.Util;
 import org.apache.james.transport.mailets.RemoteDelivery;
 import org.apache.james.userrepository.MockUsersRepository;

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java Sat Nov 15 07:56:18 2008
@@ -28,7 +28,7 @@
 import org.apache.james.socket.ProtocolHandlerHelper;
 import org.apache.james.util.watchdog.Watchdog;
 import org.apache.mailet.Mail;
-import org.apache.mailet.dates.RFC822DateFormat;
+import org.apache.mailet.base.RFC822DateFormat;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java Sat Nov 15 07:56:18 2008
@@ -35,8 +35,8 @@
 import org.apache.james.util.stream.DotStuffingInputStream;
 import org.apache.james.util.watchdog.BytesReadResetInputStream;
 import org.apache.mailet.MailAddress;
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.dates.RFC822DateFormat;
+import org.apache.mailet.base.RFC2822Headers;
+import org.apache.mailet.base.RFC822DateFormat;
 
 import javax.mail.MessagingException;
 

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java Sat Nov 15 07:56:18 2008
@@ -31,8 +31,8 @@
 import org.apache.james.smtpserver.core.filter.fastfail.JunkScoreHandler;
 import org.apache.james.smtpserver.junkscore.JunkScore;
 import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.mailet.base.test.MockMimeMessage;
+import org.apache.mailet.base.test.MockMail;
 import org.apache.mailet.Mail;
 
 import junit.framework.TestCase;

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Sat Nov 15 07:56:18 2008
@@ -35,7 +35,7 @@
 import org.apache.james.test.mock.avalon.MockStore;
 import org.apache.james.test.mock.avalon.MockThreadManager;
 import org.apache.james.test.mock.james.MockMailServer;
-import org.apache.james.test.mock.mailet.MockMailContext;
+import org.apache.mailet.base.test.MockMailContext;
 import org.apache.james.test.util.Util;
 import org.apache.james.userrepository.MockUsersRepository;
 import org.apache.james.util.codec.Base64;

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Sat Nov 15 07:56:18 2008
@@ -33,7 +33,7 @@
 import org.apache.james.smtpserver.junkscore.JunkScore;
 import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
 import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.mailet.base.test.MockMail;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java Sat Nov 15 07:56:18 2008
@@ -24,7 +24,7 @@
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.james.smtpserver.core.SetMimeHeaderHandler;
 import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Sat Nov 15 07:56:18 2008
@@ -32,8 +32,8 @@
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.james.smtpserver.core.filter.fastfail.SpamAssassinHandler;
 import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.mailet.base.test.MockMimeMessage;
+import org.apache.mailet.base.test.MockMail;
 import org.apache.james.test.mock.util.MockSpamd;
 import org.apache.james.test.util.Util;
 import org.apache.james.util.scanner.SpamAssassinInvoker;

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Sat Nov 15 07:56:18 2008
@@ -45,8 +45,8 @@
 import org.apache.james.smtpserver.junkscore.JunkScore;
 import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
 import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.mailet.base.test.MockMimeMessage;
+import org.apache.mailet.base.test.MockMail;
 import org.apache.mailet.Mail;
 
 public class URIRBLHandlerTest extends TestCase {

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java Sat Nov 15 07:56:18 2008
@@ -55,7 +55,7 @@
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mailet;
 import org.apache.mailet.MailetContext;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.Address;
 import javax.mail.Message;

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java Sat Nov 15 07:56:18 2008
@@ -32,9 +32,9 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.james.core.MailImpl;
 import org.apache.james.services.SpoolRepository;
-import org.apache.james.util.mailet.MatcherInverter;
-import org.apache.mailet.GenericMailet;
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.MatcherInverter;
+import org.apache.mailet.base.GenericMailet;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mailet;

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java Sat Nov 15 07:56:18 2008
@@ -22,7 +22,7 @@
 package org.apache.james.transport.mailets;
 
 import org.apache.commons.collections.iterators.IteratorChain;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetConfig;
 import org.apache.mailet.MailetContext;

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java Sat Nov 15 07:56:18 2008
@@ -29,10 +29,10 @@
 import org.apache.james.core.MailImpl;
 import org.apache.james.services.MailRepository;
 import org.apache.james.services.MailServer;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.Header;
 import javax.mail.MessagingException;

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Sat Nov 15 07:56:18 2008
@@ -28,10 +28,10 @@
 import org.apache.james.api.user.UsersStore;
 import org.apache.james.api.vut.ErrorMappingException;
 import org.apache.james.api.vut.VirtualUserTable;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;

Modified: james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java (original)
+++ james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java Sat Nov 15 07:56:18 2008
@@ -26,12 +26,12 @@
 import org.apache.james.core.MimeMessageCopyOnWriteProxy;
 import org.apache.james.core.MimeMessageInputStreamSource;
 import org.apache.james.test.mock.james.InMemorySpoolRepository;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMailetConfig;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
 import org.apache.james.transport.mailets.debug.DumpSystemErr;
 import org.apache.james.transport.matchers.All;
 import org.apache.james.transport.matchers.RecipientIs;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mailet;

Modified: james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java (original)
+++ james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java Sat Nov 15 07:56:18 2008
@@ -29,11 +29,11 @@
 import org.apache.james.test.mock.avalon.MockServiceManager;
 import org.apache.james.test.mock.james.InMemorySpoolRepository;
 import org.apache.james.test.mock.james.MockMailServer;
-import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMailetConfig;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MockMimeMessage;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.james.userrepository.MockUsersRepository;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;

Modified: james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/MailetLoaderTestMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/MailetLoaderTestMailet.java?rev=717869&r1=717868&r2=717869&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/MailetLoaderTestMailet.java (original)
+++ james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/MailetLoaderTestMailet.java Sat Nov 15 07:56:18 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetConfig;
 

Added: james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT-tests.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT-tests.jar?rev=717869&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT-tests.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar?rev=717869&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar?rev=717869&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar?rev=717869&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message