You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2009/02/15 22:57:46 UTC
svn commit: r744767 - in /james/server/trunk: ./
core-function/src/test/java/org/apache/james/management/impl/
core-library/src/test/java/org/apache/james/core/
mailets-function/src/test/java/org/apache/james/transport/matchers/
mailets-function/src/te...
Author: rdonkin
Date: Sun Feb 15 21:57:45 2009
New Revision: 744767
URL: http://svn.apache.org/viewvc?rev=744767&view=rev
Log:
Upgraded dependencies
Added:
james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0RC1-tests.jar (with props)
james/server/trunk/stage/org.apache.james/jars/apache-standard-mailets-1.0-SNAPSHOT-tests.jar (with props)
james/server/trunk/stage/org.apache.james/jars/apache-standard-mailets-1.0-SNAPSHOT.jar (with props)
james/server/trunk/stage/org.apache.james/poms/apache-mailet-base-1.0RC1.pom
james/server/trunk/stage/org.apache.james/poms/apache-standard-mailets-1.0-SNAPSHOT.pom
Removed:
james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT-tests.jar
james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar
james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar
james/server/trunk/stage/org.apache.james/poms/apache-james-mailet-base-1.0-SNAPSHOT.pom
Modified:
james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
james/server/trunk/core-library/src/test/java/org/apache/james/core/MailImplTest.java
james/server/trunk/include.properties
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/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/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.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/SpamAssassinHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.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
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -30,8 +30,8 @@
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.mailet.base.test.MockMimeMessage;
-import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.FakeMimeMessage;
+import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.MailUtil;
import org.apache.mailet.Mail;
@@ -86,13 +86,13 @@
}
public void testListSpoolItemsFilterByState() throws SpoolManagementException, MessagingException {
- MockMail mockMail1 = createSpoolMail(Mail.DEFAULT, "subj1", 1);
+ FakeMail mockMail1 = createSpoolMail(Mail.DEFAULT, "subj1", 1);
String messageID1 = mockMail1.getName();
String[] mailList = m_spoolManagement.listSpoolItems(OUTGOING_SPOOL, SpoolFilter.ERRORMAIL_FILTER);
assertEquals("no error mail in spool", 0, mailList.length);
- MockMail mockMail2 = createSpoolMail(Mail.ERROR, "subj2", 2);
+ FakeMail mockMail2 = createSpoolMail(Mail.ERROR, "subj2", 2);
String messageID2 = mockMail2.getName();
mailList = m_spoolManagement.listSpoolItems(OUTGOING_SPOOL, SpoolFilter.ERRORMAIL_FILTER);
@@ -109,7 +109,7 @@
public void testListSpoolItemsFilterByHeader() throws SpoolManagementException, MessagingException {
- MockMail mockMail1 = createSpoolMail(Mail.DEFAULT, "TestHeader", "value1", 1);
+ FakeMail mockMail1 = createSpoolMail(Mail.DEFAULT, "TestHeader", "value1", 1);
String messageID1 = mockMail1.getName();
createSpoolMail(Mail.ERROR, "TestHeader", "value2", 2);
@@ -151,9 +151,9 @@
public void testRemoveErrorDedicatedMail() throws SpoolManagementException, MessagingException {
createSpoolMail(Mail.DEFAULT, "subj1", 1);
- MockMail mockMail2 = createSpoolMail(Mail.ERROR, "subj2", 2);
+ FakeMail mockMail2 = createSpoolMail(Mail.ERROR, "subj2", 2);
String messageID2 = mockMail2.getName();
- MockMail mockMail3 = createSpoolMail(Mail.ERROR, "subj3", 3);
+ FakeMail mockMail3 = createSpoolMail(Mail.ERROR, "subj3", 3);
String messageID3 = mockMail3.getName();
assertEquals("one mail removed", 1, m_spoolManagement.removeSpoolItems(OUTGOING_SPOOL, messageID3, SpoolFilter.ERRORMAIL_FILTER));
@@ -162,17 +162,17 @@
assertTrue("still finds error mail", mailList[0].indexOf(messageID2) >= 0);
}
- private MockMail createSpoolMail(String state, String subject, int number) throws MessagingException {
- MockMimeMessage mimeMessage = MailUtil.createMimeMessage(subject, number);
- MockMail mockMail = MailUtil.createMockMail2Recipients(mimeMessage);
+ private FakeMail createSpoolMail(String state, String subject, int number) throws MessagingException {
+ FakeMimeMessage mimeMessage = MailUtil.createMimeMessage(subject, number);
+ FakeMail mockMail = MailUtil.createMockMail2Recipients(mimeMessage);
mockMail.setState(state);
m_mockSpoolRepository.store(mockMail);
return mockMail;
}
- private MockMail createSpoolMail(String state, String headerName, String headerRegex, int number) throws MessagingException {
- MockMimeMessage mimeMessage = MailUtil.createMimeMessage(headerName, headerRegex, "test", number);
- MockMail mockMail = MailUtil.createMockMail2Recipients(mimeMessage);
+ private FakeMail createSpoolMail(String state, String headerName, String headerRegex, int number) throws MessagingException {
+ FakeMimeMessage mimeMessage = MailUtil.createMimeMessage(headerName, headerRegex, "test", number);
+ FakeMail mockMail = MailUtil.createMockMail2Recipients(mimeMessage);
mockMail.setState(state);
m_mockSpoolRepository.store(mockMail);
return mockMail;
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -21,7 +21,7 @@
package org.apache.james.core;
-import org.apache.mailet.base.test.MockMimeMessage;
+import org.apache.mailet.base.test.FakeMimeMessage;
import org.apache.mailet.base.test.MailUtil;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mail;
@@ -58,7 +58,7 @@
assertEquals("sender", sender, mail.getSender().toString());
assertEquals("name", name, mail.getName());
- mail.setMessage(new MockMimeMessage());
+ mail.setMessage(new FakeMimeMessage());
assertNotNull("message", mail.getMessage());
}
@@ -67,7 +67,7 @@
String name = MailUtil.newId();
String sender = "sender@localhost";
MailAddress senderMailAddress = new MailAddress(sender);
- MockMimeMessage mimeMessage = new MockMimeMessage();
+ FakeMimeMessage mimeMessage = new FakeMimeMessage();
MailImpl mail = new MailImpl(name, senderMailAddress, recepients, mimeMessage);
helperTestInitialState(mail);
Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=744767&r1=744766&r2=744767&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Sun Feb 15 21:57:45 2009
@@ -272,11 +272,11 @@
mailet.jar=${path.lib.james}/${jarname.mailet.jar}
jarname.base-mailet.jar=apache-mailet-base-1.0RC1.jar
base-mailet.jar=${path.lib.james}/${jarname.base-mailet.jar}
-jarname.base-mailet.tests.jar=apache-mailet-base-1.0-SNAPSHOT-tests.jar
+jarname.base-mailet.tests.jar=apache-mailet-base-1.0RC1-tests.jar
base-mailet.tests.jar=${path.lib.james}/${jarname.base-mailet.tests.jar}
-jarname.std-mailet.jar=apache-james-standard-mailets-1.0-SNAPSHOT.jar
+jarname.std-mailet.jar=apache-standard-mailets-1.0-SNAPSHOT.jar
std-mailet.jar=${path.lib.james}/${jarname.std-mailet.jar}
-jarname.std-mailet.tests.jar=apache-james-standard-mailets-1.0-SNAPSHOT-tests.jar
+jarname.std-mailet.tests.jar=apache-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/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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -208,10 +208,10 @@
m_serviceManager = new MockServiceManager();
m_serviceManager.put(DNSService.ROLE, dnsServer);
- MockMailContext mmc = new MockMailContext();
+ FakeMailContext mmc = new FakeMailContext();
mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER, m_serviceManager);
matcher = createMatcher();
- MockMatcherConfig mci = new MockMatcherConfig(getConfigOption()
+ FakeMatcherConfig mci = new FakeMatcherConfig(getConfigOption()
+ getAllowedNetworks(), mmc);
matcher.init(mci);
}
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
@@ -44,7 +44,7 @@
public class InSpammerBlacklistTest extends TestCase {
- private MockMail mockedMail;
+ private FakeMail mockedMail;
private Matcher matcher;
@@ -74,7 +74,7 @@
return dns;
}
private void setupMockedMail(String remoteAddr) throws ParseException {
- mockedMail = new MockMail();
+ mockedMail = new FakeMail();
mockedMail.setRemoteAddr(remoteAddr);
mockedMail.setRecipients(Arrays.asList(new MailAddress[] {new MailAddress("test@email")}));
@@ -82,9 +82,9 @@
private void setupMatcher(String blacklist) throws MessagingException {
matcher = new InSpammerBlacklist();
- MockMailContext context = new MockMailContext();
+ FakeMailContext context = new FakeMailContext();
context.setAttribute(Constants.AVALON_COMPONENT_MANAGER, setUpServiceManager());
- MockMatcherConfig mci = new MockMatcherConfig("InSpammerBlacklist=" + blacklist,context);
+ FakeMatcherConfig mci = new FakeMatcherConfig("InSpammerBlacklist=" + blacklist,context);
matcher.init(mci);
}
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -21,9 +21,9 @@
package org.apache.james.transport.matchers;
import junit.framework.TestCase;
-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.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
import org.apache.mailet.base.test.MailUtil;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.RFC2822Headers;
@@ -37,7 +37,7 @@
private MimeMessage mockedMimeMessage;
- private MockMail mockedMail;
+ private FakeMail mockedMail;
private Matcher matcher;
@@ -64,7 +64,7 @@
private void setupMatcher() throws MessagingException {
setupMockedMimeMessage();
matcher = new NESSpamCheck();
- MockMatcherConfig mci = new MockMatcherConfig("NESSpamCheck", new MockMailContext());
+ FakeMatcherConfig mci = new FakeMatcherConfig("NESSpamCheck", new FakeMailContext());
matcher.init(mci);
}
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetConfig;
@@ -40,7 +40,7 @@
public class TesterMailetConfig implements MailetConfig {
- private class MailetContextTester extends MockMailContext {
+ private class MailetContextTester extends FakeMailContext {
private TesterMailetConfig owner;
private ServiceManager serviceManager;
private ServiceManager wrappedServiceManager;
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
import org.apache.james.test.util.Util;
import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.userrepository.MockUsersRepository;
@@ -199,7 +199,7 @@
SimpleConnectionManager connectionManager = new SimpleConnectionManager();
ContainerUtil.enableLogging(connectionManager, new MockLogger());
m_serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
- m_serviceManager.put(MailetContext.class.getName(), new MockMailContext());
+ m_serviceManager.put(MailetContext.class.getName(), new FakeMailContext());
m_mailServer = new MockMailServer(new MockUsersRepository());
m_serviceManager.put(MailServer.ROLE, m_mailServer);
m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);
@@ -240,10 +240,10 @@
RemoteDelivery rd = new RemoteDelivery();
- MockMailContext mmc = new MockMailContext();
+ FakeMailContext mmc = new FakeMailContext();
mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
- MockMailetConfig mci = new MockMailetConfig("Test",mmc,getStandardParameters());
+ FakeMailetConfig mci = new FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("bind", "127.0.0.1");
mci.setProperty("gateway","127.0.0.1");
mci.setProperty("gatewayPort",""+m_smtpListenerPort);
@@ -282,10 +282,10 @@
RemoteDelivery rd = new RemoteDelivery();
- MockMailContext mmc = new MockMailContext();
+ FakeMailContext mmc = new FakeMailContext();
mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
- MockMailetConfig mci = new MockMailetConfig("Test",mmc,getStandardParameters());
+ FakeMailetConfig mci = new FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
mci.setProperty("gatewayPort",""+m_smtpListenerPort);
rd.init(mci);
@@ -327,10 +327,10 @@
RemoteDelivery rd = new RemoteDelivery();
- MockMailContext mmc = new MockMailContext();
+ FakeMailContext mmc = new FakeMailContext();
mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
- MockMailetConfig mci = new MockMailetConfig("Test",mmc,getStandardParameters());
+ FakeMailetConfig mci = new FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
mci.setProperty("gatewayPort",""+m_smtpListenerPort);
rd.init(mci);
@@ -372,10 +372,10 @@
RemoteDelivery rd = new RemoteDelivery();
- MockMailContext mmc = new MockMailContext();
+ FakeMailContext mmc = new FakeMailContext();
mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
- MockMailetConfig mci = new MockMailetConfig("Test",mmc,getStandardParameters());
+ FakeMailetConfig mci = new FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
mci.setProperty("gatewayPort",""+m_smtpListenerPort);
rd.init(mci);
@@ -417,10 +417,10 @@
RemoteDelivery rd = new RemoteDelivery();
- MockMailContext mmc = new MockMailContext();
+ FakeMailContext mmc = new FakeMailContext();
mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
- MockMailetConfig mci = new MockMailetConfig("Test",mmc,getStandardParameters());
+ FakeMailetConfig mci = new FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
mci.setProperty("gatewayPort",""+m_smtpListenerPort);
rd.init(mci);
@@ -462,10 +462,10 @@
RemoteDelivery rd = new RemoteDelivery();
- MockMailContext mmc = new MockMailContext();
+ FakeMailContext mmc = new FakeMailContext();
mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
- MockMailetConfig mci = new MockMailetConfig("Test",mmc,getStandardParameters());
+ FakeMailetConfig mci = new FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
mci.setProperty("gatewayPort",""+m_smtpListenerPort);
mci.setProperty("mail.smtp.allow8bitmime", "false");
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMimeMessage;
-import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.FakeMimeMessage;
+import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.Mail;
import junit.framework.TestCase;
@@ -96,9 +96,9 @@
}
private Mail getMockMail(){
- Mail m = new MockMail();
+ Mail m = new FakeMail();
try {
- m.setMessage(new MockMimeMessage());
+ m.setMessage(new FakeMimeMessage());
} catch (MessagingException e) {
e.printStackTrace();
}
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.FakeMailContext;
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.codec.Base64;
@@ -200,7 +200,7 @@
SimpleConnectionManager connectionManager = new SimpleConnectionManager();
ContainerUtil.enableLogging(connectionManager, new MockLogger());
m_serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
- m_serviceManager.put(MailetContext.class.getName(), new MockMailContext());
+ m_serviceManager.put(MailetContext.class.getName(), new FakeMailContext());
m_mailServer = new MockMailServer(new MockUsersRepository());
m_serviceManager.put(MailServer.ROLE, m_mailServer);
m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -140,7 +140,7 @@
HashMap connectionState = new HashMap();
- Mail mail = new MockMail();
+ Mail mail = new FakeMail();
boolean stopHandler = false;
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMimeMessage;
-import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.FakeMimeMessage;
+import org.apache.mailet.base.test.FakeMail;
import org.apache.james.test.mock.util.MockSpamd;
import org.apache.james.test.util.Util;
import org.apache.james.util.scanner.SpamAssassinInvoker;
@@ -104,14 +104,14 @@
}
private Mail setupMockedMail(MimeMessage message) {
- MockMail mail = new MockMail();
+ FakeMail mail = new FakeMail();
mail.setMessage(message);
return mail;
}
public MimeMessage setupMockedMimeMessage(String text)
throws MessagingException {
- MimeMessage message = new MimeMessage(new MockMimeMessage());
+ MimeMessage message = new MimeMessage(new FakeMimeMessage());
message.setText(text);
message.saveChanges();
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -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.mailet.base.test.MockMimeMessage;
-import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.FakeMimeMessage;
+import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.Mail;
public class URIRBLHandlerTest extends TestCase {
@@ -126,14 +126,14 @@
}
private Mail setupMockedMail(MimeMessage message) {
- MockMail mail = new MockMail();
+ FakeMail mail = new FakeMail();
mail.setMessage(message);
return mail;
}
public MimeMessage setupMockedMimeMessage(String text)
throws MessagingException {
- MimeMessage message = new MimeMessage(new MockMimeMessage());
+ MimeMessage message = new MimeMessage(new FakeMimeMessage());
message.setText(text);
message.saveChanges();
@@ -141,7 +141,7 @@
}
public MimeMessage setupMockedMimeMessageMP(String text) throws MessagingException {
- MimeMessage message = new MimeMessage(new MockMimeMessage());
+ MimeMessage message = new MimeMessage(new FakeMimeMessage());
// Create the message part
BodyPart messageBodyPart = new MimeBodyPart();
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -26,8 +26,8 @@
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
import org.apache.james.test.mock.james.InMemorySpoolRepository;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
import org.apache.james.transport.mailets.debug.DumpSystemErr;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIs;
@@ -64,7 +64,7 @@
String body = "original body LinearProcessorTest\r\n.\r\n";
- MailetContext mockContext = new MockMailContext();
+ MailetContext mockContext = new FakeMailContext();
public static int counter = 0;
@@ -80,7 +80,7 @@
}
- private MailetConfig mockMailetConfig = new MockMailetConfig("Dummy",
+ private MailetConfig mockMailetConfig = new FakeMailetConfig("Dummy",
mockContext);
private CheckerMailet checkerMailet;
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=744767&r1=744766&r2=744767&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 Sun Feb 15 21:57:45 2009
@@ -29,10 +29,10 @@
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.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.FakeMimeMessage;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
import org.apache.mailet.base.test.MailUtil;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
@@ -59,7 +59,7 @@
public class LocalDeliveryTest extends TestCase {
private HashMap mailboxes;
- private MockMailContext mockMailetContext;
+ private FakeMailContext mockMailetContext;
private MockServiceManager mockServiceManager;
private MockMailServer mockMailServer;
private MockUsersRepository mockUsersRepository;
@@ -281,7 +281,7 @@
}
mockServiceManager.put(MailServer.ROLE, mockMailServer);
- mockMailetContext = new MockMailContext() {
+ mockMailetContext = new FakeMailContext() {
public void sendMail(MailAddress sender, Collection recipients, MimeMessage msg) throws MessagingException {
mockMailServer.sendMail(sender, recipients, msg);
@@ -388,18 +388,18 @@
* @throws MessagingException
*/
private Mail createMail(String[] recipients) throws MessagingException {
- Mail mail = new MockMail();
+ Mail mail = new FakeMail();
ArrayList a = new ArrayList(recipients.length);
for (int i = 0; i < recipients.length; i++) {
a.add(new MailAddress(recipients[i]));
}
mail.setRecipients(a);
- mail.setMessage(new MockMimeMessage());
+ mail.setMessage(new FakeMimeMessage());
return mail;
}
public Mailet getMailet(Properties p) throws MessagingException {
- MockMailetConfig mockMailetConfig = new MockMailetConfig("TestedLocalDelivery", mockMailetContext, p);
+ FakeMailetConfig mockMailetConfig = new FakeMailetConfig("TestedLocalDelivery", mockMailetContext, p);
Mailet m = new LocalDelivery();
m.init(mockMailetConfig);
return m;
Added: james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0RC1-tests.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0RC1-tests.jar?rev=744767&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0RC1-tests.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.apache.james/jars/apache-standard-mailets-1.0-SNAPSHOT-tests.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-standard-mailets-1.0-SNAPSHOT-tests.jar?rev=744767&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.apache.james/jars/apache-standard-mailets-1.0-SNAPSHOT-tests.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.apache.james/jars/apache-standard-mailets-1.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-standard-mailets-1.0-SNAPSHOT.jar?rev=744767&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.apache.james/jars/apache-standard-mailets-1.0-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.apache.james/poms/apache-mailet-base-1.0RC1.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-mailet-base-1.0RC1.pom?rev=744767&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-mailet-base-1.0RC1.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-mailet-base-1.0RC1.pom Sun Feb 15 21:57:45 2009
@@ -0,0 +1,339 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <name>Apache JAMES Basic Mailet Toolkit</name>
+ <version>1.0RC1</version>
+ <packaging>jar</packaging>
+ <description>
+ Apache JAMES Basic Mailet Toolkit is a collection of utilities and lightweight framework
+ aimed at developers and testers of mailets. This toolkit is extensively used elsewhere in
+ JAMES.
+ </description>
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
+ <version>1.3</version>
+ <relativePath>../james-project/project/pom.xml</relativePath>
+ </parent>
+ <url>http://james.apache.org/mailet/base/</url>
+ <inceptionYear>2008</inceptionYear>
+
+ <properties>
+ <!--
+ The website is committed to subversion. This property can be overriden
+ to upload the site to a local staging location.
+ For example, adding the following to ~/.m2/settings.xml will upload
+ to localhost:
+
+ <profiles>
+ <profile>
+ <id>main</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <james.www>scp://localhost/www</james.www>
+ <james.www.id>localhost</james.www.id>
+ ...
+ -->
+ <!-- General location for site stage -->
+ <james.www>scp://people.apache.org/www/james.apache.org/</james.www>
+ <!-- Project specific location, allowing specific override -->
+ <james.mailetbase.www>${james.www}/mailet/base/</james.mailetbase.www>
+ <!-- Overridding this value allows single set of loopback settings to be maintained -->
+ <james.www.id>mailet-base-website</james.www.id>
+ </properties>
+
+ <distributionManagement>
+ <site>
+ <id>${james.www.id}</id>
+ <url>${james.mailetbase.www}</url>
+ </site>
+ </distributionManagement>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/MAILETBASE</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/base/tags/apache-mailet-base-1.0RC1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/base/tags/apache-mailet-base-1.0RC1</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/james/mailet/base/tags/apache-mailet-base-1.0RC1?root=Apache-SVN</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>mailet-stage-repository</id>
+ <name>Stage repository</name>
+ <url>file://${basedir}/stage</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache JAMES Server List</name>
+ <subscribe>server-dev-subscribe@james.apache.org</subscribe>
+ <unsubscribe>server-dev-unsubscribe@james.apache.org</unsubscribe>
+ <post>server-dev@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <optimize>true</optimize>
+ <source>1.4</source>
+ <target>1.4</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestEntries>
+ <Specification-Title>Apache James Mailets Base</Specification-Title>
+ <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Implementation-Title>Apache James Mailets Base</Implementation-Title>
+ <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <url>${pom.url}</url>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.mailet.base.*</Export-Package>
+ <Embed-Dependency>*;scope=runtime</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ <!-- Add NOTICE and LICENSE to generated JAR -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <!-- <preProjectText>PRE PROCESS TEXT</preProjectText> -->
+ <postProjectText>This file is automatically generated by dependencies declared in pom.xml</postProjectText>
+ <addLicense>true</addLicense>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-doap-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site</id>
+ <phase>site</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doapOptions>
+ <programmingLanguage>java</programmingLanguage>
+ <category>mail</category>
+ <download-page>http://james.apache.org/download.cgi</download-page>
+ </doapOptions>
+
+ <asfExtOptions>
+ <included>true</included>
+ <pmc>http://james.apache.org</pmc>
+ <name>Apache JAMES</name>
+ </asfExtOptions>
+
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>create-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase> <!-- append to the packaging phase. -->
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <excludes>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <!-- Generated by Maven -->
+ <exclude>release.properties</exclude>
+ <exclude>dist/**/*</exclude>
+ <!-- Apache License, Version 2 -->
+ <exclude>stage/org.apache.james/xmls/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
\ No newline at end of file
Added: james/server/trunk/stage/org.apache.james/poms/apache-standard-mailets-1.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-standard-mailets-1.0-SNAPSHOT.pom?rev=744767&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-standard-mailets-1.0-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-standard-mailets-1.0-SNAPSHOT.pom Sun Feb 15 21:57:45 2009
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-standard-mailets</artifactId>
+ <name>Apache JAMES Standard Mailets</name>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <description>
+ Apache JAMES Standard Mailets is a rich collection of general purpose mailets
+ with limited dependencies. These mailets can be used in any mailet container.
+ </description>
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
+ <version>1.3</version>
+ <relativePath>../james-project/project/pom.xml</relativePath>
+ </parent>
+ <url>http://james.apache.org/mailet/standard/</url>
+ <inceptionYear>2008</inceptionYear>
+
+ <properties>
+ <!--
+ The website is committed to subversion. This property can be overriden
+ to upload the site to a local staging location.
+ For example, adding the following to ~/.m2/settings.xml will upload
+ to localhost:
+
+ <profiles>
+ <profile>
+ <id>main</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <james.www>scp://localhost/www</james.www>
+ <james.www.id>localhost</james.www.id>
+ ...
+ -->
+ <!-- General location for site stage -->
+ <james.www>scp://people.apache.org/www/james.apache.org/</james.www>
+ <!-- Project specific location, allowing specific override -->
+ <james.standardmailets.www>${james.www}/mailet/standard/</james.standardmailets.www>
+ <!-- Overridding this value allows single set of loopback settings to be maintained -->
+ <james.www.id>standard-mailet-website</james.www.id>
+ </properties>
+
+ <distributionManagement>
+ <site>
+ <id>${james.www.id}</id>
+ <url>${james.standardmailets.www}</url>
+ </site>
+ </distributionManagement>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/MAILETSTANDARD</url>
+ </issueManagement>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/james/mailet/standard/trunk
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/james/mailet/standard/trunk
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewcvs.cgi/james/mailet/standard/trunk/?root=Apache-SVN
+ </url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <version>1.0RC3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>1.0RC3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>mailet-stage-repository</id>
+ <name>Stage repository</name>
+ <url>file://${basedir}/stage</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>mailet-stage-repository</id>
+ <name>Stage repository</name>
+ <url>file://${basedir}/stage</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache JAMES Server List</name>
+ <subscribe>server-dev-subscribe@james.apache.org</subscribe>
+ <unsubscribe>server-dev-unsubscribe@james.apache.org</unsubscribe>
+ <post>server-dev@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <optimize>true</optimize>
+ <source>1.4</source>
+ <target>1.4</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestEntries>
+ <Specification-Title>Apache James Standard Mailets</Specification-Title>
+ <Specification-Version>${pom.version}</Specification-Version>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Implementation-Title>Apache James Standard Mailets</Implementation-Title>
+ <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <url>${pom.url}</url>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.james.mailet.standard.*;org.apache.james.transport.mailets;org.apache.james.transport.matchers</Export-Package>
+ <Embed-Dependency>*;scope=runtime</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Add NOTICE and LICENSE to generated JAR -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <!-- <preProjectText>PRE PROCESS TEXT</preProjectText> -->
+ <postProjectText>This file is automatically generated by dependencies declared in pom.xml</postProjectText>
+ <addLicense>true</addLicense>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>create-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-doap-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site</id>
+ <phase>site</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doapOptions>
+ <programmingLanguage>java</programmingLanguage>
+ <category>mail</category>
+ <download-page>http://james.apache.org/download.cgi</download-page>
+ </doapOptions>
+
+ <asfExtOptions>
+ <included>true</included>
+ <pmc>http://james.apache.org</pmc>
+ <name>Apache JAMES</name>
+ </asfExtOptions>
+
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase> <!-- append to the packaging phase. -->
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-mailetdocs-plugin</artifactId>
+ <version>0.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <excludes>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>LICENSE.apache</exclude>
+ <!-- Generated by Maven -->
+ <exclude>release.properties</exclude>
+ <exclude>dist/**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org