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 no...@apache.org on 2010/10/12 07:34:42 UTC
svn commit: r1021633 [1/2] - in /james/server/trunk:
core-library/src/test/java/org/apache/james/services/
mailets/src/main/java/org/apache/james/transport/mailets/
mailets/src/test/java/org/apache/james/transport/mailets/
pop3server/src/test/java/org/...
Author: norman
Date: Tue Oct 12 05:34:41 2010
New Revision: 1021633
URL: http://svn.apache.org/viewvc?rev=1021633&view=rev
Log:
Remove VirtualUserTableStore so only one VirtualUserTable implementation can be used (JAMES-1042)
Added:
james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml
- copied, changed from r1021239, james/server/trunk/spring-deployment/src/main/config/james/virtualusertable-store.xml
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/JamesVirtualUserTable.java
- copied, changed from r1021239, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/JamesVirtualUserTableStore.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagementMBeanImpl.java
- copied, changed from r1021239, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java
Removed:
james/server/trunk/smtpserver/src/test/java/org/apache/james/test/mock/DummyVirtualUserTableStore.java
james/server/trunk/spring-deployment/src/main/config/james/virtualusertable-store.xml
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTableStore.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/InvalidMappingException.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java
james/server/trunk/user-api/src/test/java/org/apache/james/api/vut/management/MockVirtualUserTableManagementService.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/JamesVirtualUserTableStore.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java
james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableStore.java
Modified:
james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java
james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/user-function/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java
james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/MockJSR250Loader.java Tue Oct 12 05:34:41 2010
@@ -28,58 +28,17 @@ public class MockJSR250Loader extends Ab
private final Map<String, Object> servicesByName;
- private final Map<String, String> mappings = new HashMap<String, String>();
public MockJSR250Loader() {
servicesByName = new HashMap<String, Object>();
-// TODO Do we still need that?
-// servicesByName.put(org.apache.james.LoaderService, this);
-
- mappings.put("mailserver", org.apache.james.services.MailServer.class.getName());
- mappings.put("filesystem", org.apache.james.services.FileSystem.class.getName());
- mappings.put("dnsservice", org.apache.james.dnsservice.api.DNSService.class.getName());
- mappings.put("users-store", org.apache.james.api.user.UsersStore.class.getName());
- mappings.put("localusersrepository", org.apache.james.api.user.UsersRepository.class.getName());
- mappings.put("defaultvirtualusertable", org.apache.james.api.vut.VirtualUserTable.class.getName());
- mappings.put("virtualusertablemanagement", org.apache.james.api.vut.management.VirtualUserTableManagement.class.getName());
- mappings.put("domainlist", org.apache.james.api.domainlist.DomainList.class.getName());
-
-// TODO Review the needed services
-
- mappings.put("domainlistmanagement", "org.apache.james.management.DomainListManagementService");
- mappings.put("mailstore", "org.apache.avalon.cornerstone.services.store.Store");
- mappings.put("spoolrepository", "org.apache.james.services.SpoolRepository");
- mappings.put("sockets", "org.apache.avalon.cornerstone.services.sockets.SocketManager");
- mappings.put("scheduler", "org.apache.avalon.cornerstone.services.scheduler.TimeScheduler");
- mappings.put("database-connections", "org.apache.avalon.cornerstone.services.datasources.DataSourceSelector");
- mappings.put("spoolmanager", "org.apache.james.services.SpoolManager");
- mappings.put("matcherpackages", "org.apache.james.transport.MatcherLoader");
- mappings.put("mailetpackages", "org.apache.james.transport.MailetLoader");
- mappings.put("virtualusertable-store", "org.apache.james.api.vut.VirtualUserTableStore");
- mappings.put("imapserver", "org.org.apache.jsieve.mailet.Poster");
- mappings.put("threadmanager", "org.apache.avalon.cornerstone.services.threads.ThreadManager");
- mappings.put("spoolmanagement", "org.apache.james.management.SpoolManagementService");
- mappings.put("bayesiananalyzermanagement", "org.apache.james.management.BayesianAnalyzerManagementService");
- mappings.put("processormanagement", "org.apache.james.management.ProcessorManagementService");
- mappings.put("virtualusertablemanagementservice", "org.apache.james.api.vut.management.VirtualUserTableManagementService");
- mappings.put("nntp-repository", "org.apache.james.nntpserver.repository.NNTPRepository");
-
}
public Object get(String name) {
- Object service = servicesByName.get(mapName(name));
+ Object service = servicesByName.get(name);
return service;
}
-
- private String mapName(String name) {
- String newName = mappings.get(name);
- if(newName == null) {
- newName = name;
- }
- return newName;
- }
public void put(String role, Object service) {
servicesByName.put(role, service);
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java Tue Oct 12 05:34:41 2010
@@ -27,59 +27,26 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import org.apache.james.api.vut.ErrorMappingException;
-import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.mailet.MailAddress;
-import org.apache.mailet.MailetException;
/**
* Mailet which should get used when using VirtualUserTable-Store to implementations
* for mappings of forwards and aliases.
*
- * If no VirtualUsertable-Store name is given the default of DefaultVirtualUserTable
- * will get used.
- *
- * eg. <virtualusertable>DefaultVirtualUserTable</virtualusertable>
*
*/
public class VirtualUserTable extends AbstractVirtualUserTableMailet {
- private VirtualUserTableStore vutStore;
private org.apache.james.api.vut.VirtualUserTable vut;
-
- /**
- * Gets the virtual user table store.
- * @return the vutStore, possibly null
- */
- public final VirtualUserTableStore getVutStore() {
- return vutStore;
- }
-
/**
* Sets the virtual table store.
* @param vutStore the vutStore to set, possibly null
*/
- @Resource(name="virtualusertable-store")
- public final void setVutStore(VirtualUserTableStore vutStore) {
- this.vutStore = vutStore;
+ @Resource(name="virtualusertable")
+ public final void setVirtualUserTable(org.apache.james.api.vut.VirtualUserTable vut) {
+ this.vut = vut;
}
- /**
- * @see org.apache.mailet.base.GenericMailet#init()
- */
- public void init() throws MessagingException {
- super.init();
-
- if (vutStore == null) {
- throw new MailetException("Not initialised. Please ensure that the mailet container supports either" +
- " setter or constructor injection. ");
- }
-
- String vutName = getInitParameter("virtualusertable");
- vut = vutStore.getTable(vutName);
- if (vut == null) {
- throw new MailetException("Could not find VirtualUserTable with name " + vutName);
- }
- }
/**
* @see org.apache.james.transport.mailets.AbstractVirtualUserTable#processMail(org.apache.mailet.MailAddress, org.apache.mailet.MailAddress, javax.mail.internet.MimeMessage)
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java Tue Oct 12 05:34:41 2010
@@ -30,7 +30,6 @@ import javax.mail.MessagingException;
import junit.framework.TestCase;
import org.apache.james.api.vut.ErrorMappingException;
-import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.base.test.FakeMail;
@@ -61,19 +60,16 @@ public class VirtualUserTableTest extend
FakeMailetConfig mockMailetConfig = new FakeMailetConfig("vut", mockMailetContext, new Properties());
//mockMailetConfig.put("virtualusertable", "vut");
- table.setVutStore(new VirtualUserTableStore() {
-
- public org.apache.james.api.vut.VirtualUserTable getTable(String name) {
- return new org.apache.james.api.vut.VirtualUserTable() {
+ table.setVirtualUserTable(new org.apache.james.api.vut.VirtualUserTable() {
+ public Collection<String> getMappings(String user,
+ String domain) throws ErrorMappingException {
+ if (user.equals("test") && domain.equals("localhost"))
+ return Arrays.asList(new String[] {
+ "whatever@localhost", "blah@localhost" });
+ return null;
+ }
- public Collection<String> getMappings(String user, String domain) throws ErrorMappingException {
- if (user.equals("test") && domain.equals("localhost")) return Arrays.asList(new String[]{"whatever@localhost","blah@localhost"});
- return null;
- }
-
- };
- }
- });
+ });
table.init(mockMailetConfig);
Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java Tue Oct 12 05:34:41 2010
@@ -39,7 +39,6 @@ import org.apache.commons.net.pop3.POP3R
import org.apache.james.services.MockJSR250Loader;
import org.apache.james.services.MockFileSystem;
import org.apache.james.services.MockMailServer;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
@@ -50,7 +49,6 @@ import org.apache.james.mailbox.MailboxC
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailbox.store.Authenticator;
-import org.apache.james.services.MailServer;
import org.apache.james.socket.JamesProtocolHandlerChain;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.POP3BeforeSMTPHelper;
@@ -99,8 +97,8 @@ public abstract class AbstractAsyncPOP3S
serviceManager = new MockJSR250Loader();
m_mailServer = new MockMailServer();
- serviceManager.put(MailServer.ROLE, m_mailServer);
- serviceManager.put(UsersRepository.ROLE,
+ serviceManager.put("mailserver", m_mailServer);
+ serviceManager.put("localusersrepository",
m_usersRepository);
InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory();
@@ -115,9 +113,9 @@ public abstract class AbstractAsyncPOP3S
serviceManager.put("mailboxmanager", manager);
dnsservice = setUpDNSServer();
- serviceManager.put(DNSService.ROLE, setUpDNSServer());
+ serviceManager.put("dnsservice", setUpDNSServer());
fSystem = new MockFileSystem();
- serviceManager.put(MockFileSystem.ROLE,fSystem);
+ serviceManager.put("filesystem",fSystem);
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java Tue Oct 12 05:34:41 2010
@@ -21,50 +21,38 @@ package org.apache.james.remotemanager.c
import javax.annotation.Resource;
+import org.apache.james.api.vut.management.VirtualUserTableManagement;
import org.apache.james.api.vut.management.VirtualUserTableManagementException;
-import org.apache.james.api.vut.management.VirtualUserTableManagementService;
import org.apache.james.remotemanager.CommandHandler;
public abstract class AbstractMappingCmdHandler implements CommandHandler {
protected final static String ADD_MAPPING_ACTION = "ADDMAPPING";
protected final static String REMOVE_MAPPING_ACTION = "REMOVEMAPPING";
- protected VirtualUserTableManagementService vutManagement;
+ protected VirtualUserTableManagement vutManagement;
- @Resource(name = "virtualusertablemanagementservice")
- public final void setVirtualUserTableManagementService(VirtualUserTableManagementService vutManagement) {
+ @Resource(name = "virtualusertablemanagement")
+ public final void setVirtualUserTableManagement(VirtualUserTableManagement vutManagement) {
this.vutManagement = vutManagement;
}
protected boolean mappingAction(String[] args, String action) throws IllegalArgumentException, VirtualUserTableManagementException {
- String table = null;
String user = null;
String domain = null;
String mapping = null;
- if (args[0].startsWith("table=")) {
- table = args[0].substring("table=".length());
- if (args[1].indexOf("@") > 0) {
- user = getMappingValue(args[1].split("@")[0]);
- domain = getMappingValue(args[1].split("@")[1]);
- } else {
- throw new IllegalArgumentException("Invalid usage.");
- }
- mapping = args[2];
- } else {
- if (args[0].indexOf("@") > 0) {
- user = getMappingValue(args[0].split("@")[0]);
- domain = getMappingValue(args[0].split("@")[1]);
- } else {
- throw new IllegalArgumentException("Invalid usage.");
- }
- mapping = args[1];
- }
+ if (args[0].indexOf("@") > 0) {
+ user = getMappingValue(args[0].split("@")[0]);
+ domain = getMappingValue(args[0].split("@")[1]);
+ } else {
+ throw new IllegalArgumentException("Invalid usage.");
+ }
+ mapping = args[1];
if (action.equals(ADD_MAPPING_ACTION)) {
- return vutManagement.addMapping(table, user, domain, mapping);
+ return vutManagement.addMapping(user, domain, mapping);
} else if (action.equals(REMOVE_MAPPING_ACTION)) {
- return vutManagement.removeMapping(table, user, domain, mapping);
+ return vutManagement.removeMapping(user, domain, mapping);
} else {
throw new IllegalArgumentException("Invalid action: " + action);
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java Tue Oct 12 05:34:41 2010
@@ -32,7 +32,7 @@ import org.apache.james.remotemanager.Re
public class AddMappingCmdHandler extends AbstractMappingCmdHandler {
- private CommandHelp help = new CommandHelp("addmapping ([table=virtualusertablename]) [toUser@toDomain] [fromMapping]","add mapping for the given emailaddress");
+ private CommandHelp help = new CommandHelp("addmapping [toUser@toDomain] [fromMapping]","add mapping for the given emailaddress");
/*
* (non-Javadoc)
@@ -46,7 +46,7 @@ public class AddMappingCmdHandler extend
args = parameters.split(" ");
// check if the command was called correct
- if (parameters == null || parameters.trim().equals("") || args.length < 2 || args.length > 3) {
+ if (parameters == null || parameters.trim().equals("") || args.length != 2) {
response = new RemoteManagerResponse("Usage: " + help.getSyntax());
} else {
try {
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java Tue Oct 12 05:34:41 2010
@@ -48,9 +48,11 @@ public class CountUsersCmdHandler extend
}
@Override
- public Response onCommand(RemoteManagerSession session, Request request) { RemoteManagerResponse response;
+ public Response onCommand(RemoteManagerSession session, Request request) {
+ RemoteManagerResponse response;
String parameters = request.getArgument();
UsersRepository users = uStore.getRepository(((String) session.getState().get(RemoteManagerSession.CURRENT_USERREPOSITORY)));
+ System.out.println("users " +users);
if (parameters == null) {
response = new RemoteManagerResponse("Existing accounts " + users.countUsers());
return response;
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java Tue Oct 12 05:34:41 2010
@@ -27,8 +27,7 @@ import java.util.Map;
import javax.annotation.Resource;
-import org.apache.james.api.vut.management.VirtualUserTableManagementException;
-import org.apache.james.api.vut.management.VirtualUserTableManagementService;
+import org.apache.james.api.vut.management.VirtualUserTableManagement;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
@@ -37,14 +36,14 @@ import org.apache.james.remotemanager.Re
import org.apache.james.remotemanager.RemoteManagerSession;
public class ListAllMappingsCmdHandler implements CommandHandler {
- private CommandHelp help = new CommandHelp("listallmappings ([table=virtualusertablename])","list all mappings");
+ private CommandHelp help = new CommandHelp("listallmappings","list all mappings");
public final static String COMMAND_NAME = "LISTALLMAPPINGS";
- protected VirtualUserTableManagementService vutManagement;
+ protected VirtualUserTableManagement vutManagement;
- @Resource(name = "virtualusertablemanagementservice")
- public final void setVirtualUserTableManagementService(VirtualUserTableManagementService vutManagement) {
+ @Resource(name = "virtualusertablemanagement")
+ public final void setVirtualUserTableManagementService(VirtualUserTableManagement vutManagement) {
this.vutManagement = vutManagement;
}
@@ -55,25 +54,19 @@ public class ListAllMappingsCmdHandler i
public Response onCommand(RemoteManagerSession session, Request request) {
RemoteManagerResponse response;
String[] args = null;
- String table = null;
String parameters = request.getArgument();
if (parameters != null)
args = parameters.split(" ");
// check if the command was called correct
- if (args != null && args.length > 1) {
+ if (args != null && args.length > 0) {
response = new RemoteManagerResponse("Usage: " + help.getSyntax());
return response;
}
- if (args != null && args[0].startsWith("table=")) {
- table = args[0].substring("table=".length());
-
- }
-
try {
- Map<String,Collection<String>> mappings = vutManagement.getAllMappings(table);
+ Map<String,Collection<String>> mappings = vutManagement.getAllMappings();
if (mappings == null) {
response = new RemoteManagerResponse("No mappings found");
} else {
@@ -85,9 +78,6 @@ public class ListAllMappingsCmdHandler i
response.appendLine(key + " -> " + mappings.get(key));
}
}
- } catch (VirtualUserTableManagementException e) {
- session.getLogger().error("Error on listing all mapping: " + e);
- response = new RemoteManagerResponse("Error on listing all mapping: " + e);
} catch (IllegalArgumentException e) {
session.getLogger().error("Error on listing all mapping: " + e);
response = new RemoteManagerResponse("Error on listing all mapping: " + e);
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java Tue Oct 12 05:34:41 2010
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import org.apache.james.api.vut.management.VirtualUserTableManagement;
import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -32,7 +33,7 @@ import org.apache.james.remotemanager.Re
import org.apache.james.remotemanager.RemoteManagerSession;
public class ListMappingCmdHandler extends AbstractMappingCmdHandler {
- private CommandHelp help = new CommandHelp("listmapping ([table=virtualusertablename]) [user@domain]","list all mappings for the given emailaddress");
+ private CommandHelp help = new CommandHelp("listmapping [user@domain]","list all mappings for the given emailaddress");
public final static String COMMAND_NAME = "LISTMAPPING";
@@ -44,7 +45,6 @@ public class ListMappingCmdHandler exten
RemoteManagerResponse response;
String parameters = request.getArgument();
String[] args = null;
- String table = null;
String user = null;
String domain = null;
@@ -52,43 +52,38 @@ public class ListMappingCmdHandler exten
args = parameters.split(" ");
// check if the command was called correct
- if (parameters == null || parameters.trim().equals("") || args.length < 1 || args.length > 2) {
+ if (parameters == null || parameters.trim().equals("") || args.length != 1) {
response = new RemoteManagerResponse("Usage: " + help.getSyntax());
return response;
} else {
- if (args[0].startsWith("table=")) {
- table = args[0].substring("table=".length());
- if (args[1].indexOf("@") > 0) {
- user = getMappingValue(args[1].split("@")[0]);
- domain = getMappingValue(args[1].split("@")[1]);
- } else {
- response = new RemoteManagerResponse("Usage: " + help.getSyntax());
- return response;
-
- }
- } else {
- if (args[0].indexOf("@") > 0) {
- user = getMappingValue(args[0].split("@")[0]);
- domain = getMappingValue(args[0].split("@")[1]);
- } else {
- response = new RemoteManagerResponse("Usage: " + help.getSyntax());
- return response;
+
+ if (args[0].indexOf("@") > 0) {
+ user = getMappingValue(args[0].split("@")[0]);
+ domain = getMappingValue(args[0].split("@")[1]);
+ } else {
+ response = new RemoteManagerResponse("Usage: "
+ + help.getSyntax());
+ return response;
- }
- }
+ }
try {
- Collection<String> mappings = vutManagement.getUserDomainMappings(table, user, domain);
- if (mappings == null) {
- response = new RemoteManagerResponse("No mappings found");
- } else {
- response = new RemoteManagerResponse("Mappings:");
-
- Iterator<String> m = mappings.iterator();
- while (m.hasNext()) {
- response.appendLine(m.next());
+ if (vutManagement instanceof VirtualUserTableManagement) {
+ Collection<String> mappings = ((VirtualUserTableManagement)vutManagement).getUserDomainMappings(user, domain);
+ if (mappings == null) {
+ response = new RemoteManagerResponse("No mappings found");
+ } else {
+ response = new RemoteManagerResponse("Mappings:");
+
+ Iterator<String> m = mappings.iterator();
+ while (m.hasNext()) {
+ response.appendLine(m.next());
+ }
}
- }
+ } else {
+ response = new RemoteManagerResponse("Listing mappings not supported");
+ }
+
} catch (VirtualUserTableManagementException e) {
session.getLogger().error("Error on listing mapping: " + e);
response = new RemoteManagerResponse("Error on listing mapping: " + e);
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java Tue Oct 12 05:34:41 2010
@@ -31,7 +31,7 @@ import org.apache.james.remotemanager.Re
import org.apache.james.remotemanager.RemoteManagerSession;
public class RemoveMappingCmdHandler extends AbstractMappingCmdHandler {
- private CommandHelp help = new CommandHelp("removemapping ([table=virtualusertablename]) [toUser@toDomain] [fromMapping]","remove mapping for the given emailaddress");
+ private CommandHelp help = new CommandHelp("removemapping [toUser@toDomain] [fromMapping]","remove mapping for the given emailaddress");
/*
* (non-Javadoc)
@@ -46,7 +46,7 @@ public class RemoveMappingCmdHandler ext
args = parameters.split(" ");
// check if the command was called correct
- if (parameters == null || parameters.trim().equals("") || args.length < 2 || args.length > 3) {
+ if (parameters == null || parameters.trim().equals("") || args.length != 2) {
response = new RemoteManagerResponse("Usage: " + help.getSyntax());
} else {
try {
Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Tue Oct 12 05:34:41 2010
@@ -41,10 +41,6 @@ import org.apache.james.api.domainlist.S
import org.apache.james.services.MockJSR250Loader;
import org.apache.james.services.MockFileSystem;
import org.apache.james.services.MockMailServer;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
-import org.apache.james.api.vut.management.MockVirtualUserTableManagementService;
-import org.apache.james.api.vut.management.VirtualUserTableManagementService;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
import org.apache.james.lifecycle.LifecycleUtil;
@@ -57,9 +53,9 @@ import org.apache.james.management.Proce
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementException;
import org.apache.james.management.SpoolManagementService;
-import org.apache.james.services.MailServer;
import org.apache.james.socket.JamesProtocolHandlerChain;
import org.apache.james.test.mock.james.MockUsersStore;
+import org.apache.james.test.mock.james.MockVirtualUserTableManagementImpl;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.TestUtil;
@@ -77,7 +73,7 @@ public abstract class AbstractRemoteMana
private MockUsersStore usersStore;
protected DNSService dnsservice;
protected MockFileSystem filesystem;
- private MockVirtualUserTableManagementService vutManagement;
+ private MockVirtualUserTableManagementImpl vutManagement;
protected JamesProtocolHandlerChain chain;
protected void setUp() throws Exception {
@@ -181,29 +177,25 @@ public abstract class AbstractRemoteMana
serviceManager = new MockJSR250Loader();
m_mockUsersRepository = new MockUsersRepository();
+ serviceManager.put("localusersrepository", m_mockUsersRepository);
- mailServer = new MockMailServer();
- usersStore = new MockUsersStore(m_mockUsersRepository);
- serviceManager.put(MailServer.ROLE, mailServer);
- serviceManager.put(UsersRepository.ROLE, m_mockUsersRepository);
+ usersStore = new MockUsersStore(m_mockUsersRepository);
+ serviceManager.put("users-store", usersStore);
+ mailServer = new MockMailServer();
+ serviceManager.put("mailserver", mailServer);
+
filesystem = new MockFileSystem();
- serviceManager.put(MockFileSystem.ROLE, filesystem);
+ serviceManager.put("filesystem", filesystem);
- serviceManager.put(UsersStore.ROLE, usersStore);
dnsservice = setUpDNSServer();
- serviceManager.put(DNSService.ROLE, dnsservice);
- vutManagement = new MockVirtualUserTableManagementService();
- // VirtualUserTableManagementService vutManagement = new
- // VirtualUserTableManagement();
- // vutManagement.setVirtualUserTableStore(vutStore);
- // vutManagement.setVirtualUserTableManagement(new
- // MockVirtualUserTableManagementImpl());
- serviceManager.put(VirtualUserTableManagementService.ROLE,
- new MockVirtualUserTableManagementService());
-
+ serviceManager.put("dnsservice", dnsservice);
+
+ vutManagement = new MockVirtualUserTableManagementImpl();
+ serviceManager.put("virtualusertablemanagement", vutManagement);
+
ManageableDomainList xml = new SimpleDomainList();
DomainListManagementService domManagement = new DomainListManagementService() {
@@ -236,8 +228,8 @@ public abstract class AbstractRemoteMana
}.setDomainList(xml);
- serviceManager.put(DomainListManagementService.ROLE, domManagement);
- serviceManager.put(BayesianAnalyzerManagementService.ROLE,
+ serviceManager.put("domainlistmanagement", domManagement);
+ serviceManager.put("bayesiananalyzermanagement",
new BayesianAnalyzerManagementService() {
public void resetData()
@@ -316,7 +308,7 @@ public abstract class AbstractRemoteMana
}
});
serviceManager.put("mailStore", new MockMailStore());
- serviceManager.put(ProcessorManagementService.ROLE,
+ serviceManager.put("processormanagement",
new ProcessorManagementService() {
public String[] getProcessorNames() {
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Tue Oct 12 05:34:41 2010
@@ -21,7 +21,6 @@ package org.apache.james.smtpserver.fast
import java.util.Collection;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
@@ -29,7 +28,6 @@ import org.apache.commons.configuration.
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
-import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler;
@@ -44,11 +42,9 @@ public class ValidRcptHandler extends Ab
private UsersRepository users;
- private VirtualUserTableStore tableStore;
- private VirtualUserTable table;
- private String tableName = null;
+ private VirtualUserTable vut;
- private boolean vut = true;
+ private boolean useVut = true;
private MailServer mailServer;
@@ -73,34 +69,20 @@ public class ValidRcptHandler extends Ab
}
/**
- * Gets the virtual user table store.
- *
- * @return the tableStore
- */
- public final VirtualUserTableStore getTableStore() {
- return tableStore;
- }
-
- /**
* Sets the virtual user table store.
*
* @param tableStore
* the tableStore to set
*/
- @Resource(name = "virtualusertable-store")
- public final void setTableStore(VirtualUserTableStore tableStore) {
- this.tableStore = tableStore;
+ @Resource(name = "virtualusertable")
+ public final void setVirtualUserTable(VirtualUserTable vut) {
+ this.vut = vut;
}
@Resource(name = "mailserver")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
-
- @PostConstruct
- public void init() throws Exception{
- loadTable();
- }
/**
* @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.Configuration)
@@ -108,19 +90,10 @@ public class ValidRcptHandler extends Ab
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
setVirtualUserTableSupport(config.getBoolean("enableVirtualUserTable",
true));
- setTableName(config.getString("table", null));
- }
-
- public void setVirtualUserTableSupport(boolean vut) {
- this.vut = vut;
- }
-
- public void setTableName(String tableName) {
- this.tableName = tableName;
}
- private void loadTable() throws Exception {
- table = tableStore.getTable(this.tableName);
+ public void setVirtualUserTableSupport(boolean useVut) {
+ this.useVut = useVut;
}
@@ -145,11 +118,11 @@ public class ValidRcptHandler extends Ab
return true;
} else {
- if (vut == true) {
+ if (useVut == true) {
session.getLogger().debug("Unknown user " + username + " check if its an alias");
try {
- Collection<String> targetString = table.getMappings(
+ Collection<String> targetString = vut.getMappings(
recipient.getLocalPart(), recipient.getDomain());
if (targetString != null && targetString.isEmpty() == false) {
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Tue Oct 12 05:34:41 2010
@@ -42,17 +42,14 @@ import org.apache.commons.logging.impl.S
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.james.services.MockJSR250Loader;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.vut.VirtualUserTableStore;
+import org.apache.james.api.vut.ErrorMappingException;
+import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailstore.MockMailStore;
-import org.apache.james.services.FileSystem;
-import org.apache.james.services.MailServer;
import org.apache.james.services.MockFileSystem;
import org.apache.james.services.MockMailServer;
import org.apache.james.socket.JamesProtocolHandlerChain;
-import org.apache.james.test.mock.DummyVirtualUserTableStore;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.TestUtil;
import org.apache.james.util.codec.Base64;
@@ -213,19 +210,26 @@ public abstract class AbstractSMTPServer
protected void setUpFakeLoader() throws Exception {
m_serviceManager = new MockJSR250Loader();
m_mailServer = new MockMailServer();
- m_serviceManager.put(MailServer.ROLE, m_mailServer);
- m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);
+ m_serviceManager.put("mailserver", m_mailServer);
+ m_serviceManager.put("localusersrepository", m_usersRepository);
m_dnsServer = new AlterableDNSServer();
- m_serviceManager.put(DNSService.ROLE, m_dnsServer);
+ m_serviceManager.put("dnsservice", m_dnsServer);
store = new MockMailStore();
m_serviceManager.put("mailStore", store);
fileSystem = new MockFileSystem();
- m_serviceManager.put(FileSystem.ROLE, fileSystem);
+ m_serviceManager.put("filesystem", fileSystem);
m_serviceManager.put("org.apache.james.smtpserver.protocol.DNSService", dnsAdapter);
- m_serviceManager.put(VirtualUserTableStore.ROLE, new DummyVirtualUserTableStore());
+ m_serviceManager.put("virtualusertable", new VirtualUserTable() {
+
+ public Collection<String> getMappings(String user, String domain)
+ throws ErrorMappingException {
+ return null;
+ }
+
+ });
m_serviceManager.put("org.apache.james.smtpserver.protocol.DNSService", dnsAdapter);
}
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Tue Oct 12 05:34:41 2010
@@ -22,29 +22,24 @@
package org.apache.james.smtpserver;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
import junit.framework.TestCase;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
-import org.apache.james.api.vut.VirtualUserTableStore;
-import org.apache.james.mailrepository.MailRepository;
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
-import org.apache.james.test.mock.james.MockVirtualUserTableStore;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -66,14 +61,9 @@ public class ValidRcptHandlerTest extend
users.addUser(VALID_USER,"xxx");
handler = new ValidRcptHandler();
handler.setUsers(users);
- handler.setTableStore(setUpVirtualUserTableStore());
+ handler.setVirtualUserTable(setUpVirtualUserTable());
handler.setMailServer(new MailServer() {
- public boolean addUser(String userName, String password) {
- // TODO Auto-generated method stub
- return false;
- }
-
public String getDefaultDomain() {
// TODO Auto-generated method stub
return null;
@@ -89,34 +79,19 @@ public class ValidRcptHandlerTest extend
return null;
}
- public MailRepository getUserInbox(String userName) {
- // TODO Auto-generated method stub
- return null;
- }
public boolean isLocalServer(String serverName) {
return serverName.equals(VALID_DOMAIN);
}
- public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage msg) throws MessagingException {
- // TODO Auto-generated method stub
-
- }
-
- public void sendMail(MailAddress sender, Collection<MailAddress> recipients, InputStream msg) throws MessagingException {
- // TODO Auto-generated method stub
-
- }
+
public void sendMail(Mail mail) throws MessagingException {
// TODO Auto-generated method stub
}
- public void sendMail(MimeMessage message) throws MessagingException {
- // TODO Auto-generated method stub
-
- }
+
public boolean supportVirtualHosting() {
// TODO Auto-generated method stub
@@ -124,7 +99,6 @@ public class ValidRcptHandlerTest extend
}
});
- handler.init();
}
private SMTPSession setupMockedSMTPSession(final SMTPConfiguration conf, final MailAddress rcpt, final boolean relayingAllowed) {
@@ -143,7 +117,7 @@ public class ValidRcptHandlerTest extend
return session;
}
- private VirtualUserTableStore setUpVirtualUserTableStore() {
+ private VirtualUserTable setUpVirtualUserTable() {
final VirtualUserTable table = new VirtualUserTable() {
public Collection<String> getMappings(String user, String domain) throws ErrorMappingException {
@@ -156,15 +130,7 @@ public class ValidRcptHandlerTest extend
return mappings;
}
};
- final MockVirtualUserTableStore store = new MockVirtualUserTableStore() {
-
- @Override
- public VirtualUserTable getTable(String name) {
- return table;
- }
-
- };
- return store;
+ return table;
}
private SMTPConfiguration setupMockedSMTPConfiguration() {
Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Tue Oct 12 05:34:41 2010
@@ -257,16 +257,8 @@
<!-- The context FileSystem implementation -->
<bean id="filesystem" class="org.apache.james.container.spring.SpringFileSystem" />
- <!-- The VirtualUserTable Management block -->
- <bean id="virtualusertablemanagementservice" class="org.apache.james.impl.vut.VirtualUserTableManagement" />
- <!-- VirtualUserTable Store -->
- <bean id="virtualusertable-store" class="org.apache.james.impl.vut.JamesVirtualUserTableStore">
- <property name="defaultTable" value="DefaultVirtualUserTable"/>
- </bean>
-
-
- <bean id="defaultvirtualusertable" name="virtualusertablemanagement" class="org.apache.james.impl.vut.DefaultVirtualUserTable" />
+ <bean id="virtualusertable" name="virtualusertablemanagement" class="org.apache.james.impl.vut.JamesVirtualUserTable" />
<!-- The context domainlist implementation -->
<bean id="domainlist" class="org.apache.james.domain.XMLDomainList" />
Copied: james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml (from r1021239, james/server/trunk/spring-deployment/src/main/config/james/virtualusertable-store.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml?p2=james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml&p1=james/server/trunk/spring-deployment/src/main/config/james/virtualusertable-store.xml&r1=1021239&r2=1021633&rev=1021633&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/virtualusertable-store.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/virtualusertable.xml Tue Oct 12 05:34:41 2010
@@ -17,18 +17,19 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- The VirtualUserTable Store block -->
-<virtualusertable-store>
- <!-- Configure VirtualUserTable stores here. -->
+<!-- The VirtualUserTable block -->
+<virtualusertable>
+ <!-- Configure VirtualUserTable here. -->
+ <!-- Only one table can be active -->
+
<!-- -->
<!-- If set recursiveMapping false only the first mapping will get processed. -->
<!-- Default true. -->
<!-- By setting the mappingLimit you can specify how much mapping will get processed -->
<!-- before a bounce will send. This avoid infinity loops. Default 10. -->
- <!-- The DefaultVirtualUserTable for storing James' VirtualUserTable mappings. -->
<!--
- <table name="DefaultVirtualUserTable" class="org.apache.james.vut.XMLVirtualUserTable">
+ <table class="org.apache.james.vut.XMLVirtualUserTable">
<recursiveMapping> true </recursiveMapping>
<mappingLimit> 10 </mappingLimit>
@@ -40,18 +41,18 @@
<!-- -->
<!-- Use these configurations to store the VirtualUserTable in a database. -->
- <!-- The DefaultVirtualUserTable for storing James' VirtualUserTable mappings. -->
<!--
- <table name="DefaultVirtualUserTable" class="org.apache.james.vut.JDBCVirtualUserTable" destinationURL="db://maildb/VirtualUserTable">
+ <table class="org.apache.james.vut.JDBCVirtualUserTable" destinationURL="db://maildb/VirtualUserTable">
<recursiveMapping> true </recursiveMapping>
<mappingLimit> 10 </mappingLimit>
<sqlFile>file://conf/sqlResources.xml</sqlFile>
</table>
-->
- <!-- The DefaultVirtualUserTable for storing James' VirtualUserTable mappings. -->
- <table name="DefaultVirtualUserTable" class="org.apache.james.vut.JPAVirtualUserTable">
+
+ <!-- The default table for storing James' VirtualUserTable mappings. -->
+ <table class="org.apache.james.vut.JPAVirtualUserTable">
<recursiveMapping> true </recursiveMapping>
<mappingLimit> 10 </mappingLimit>
</table>
-</virtualusertable-store>
+</virtualusertable>
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagement.java Tue Oct 12 05:34:41 2010
@@ -40,9 +40,9 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param regex the regex.
* @return true if successfully
- * @throws InvalidMappingException get thrown if an invalid argument was given
+ * @throws VirtualUserTableManagementException get thrown if an invalid argument was given
*/
- public boolean addRegexMapping(String user, String domain, String regex) throws InvalidMappingException;
+ public boolean addRegexMapping(String user, String domain, String regex) throws VirtualUserTableManagementException;
/**
* Remove regex mapping
@@ -51,9 +51,9 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param regex the regex.
* @return true if successfully
- * @throws InvalidMappingException get thrown if an invalid argument was given
+ * @throws VirtualUserTableManagementException get thrown if an invalid argument was given
*/
- public boolean removeRegexMapping(String user,String domain, String regex) throws InvalidMappingException;
+ public boolean removeRegexMapping(String user,String domain, String regex) throws VirtualUserTableManagementException;
/***
* Add address mapping
@@ -62,9 +62,9 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param address
* @return true if successfully
- * @throws InvalidMappingException get thrown if an invalid argument was given
+ * @throws VirtualUserTableManagementException get thrown if an invalid argument was given
*/
- public boolean addAddressMapping(String user, String domain, String address) throws InvalidMappingException;
+ public boolean addAddressMapping(String user, String domain, String address) throws VirtualUserTableManagementException;
/**
* Remove address mapping
@@ -73,9 +73,9 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param address
* @return true if successfully
- * @throws InvalidMappingException get thrown if an invalid argument was given
+ * @throws VirtualUserTableManagementException get thrown if an invalid argument was given
*/
- public boolean removeAddressMapping(String user,String domain, String address) throws InvalidMappingException;
+ public boolean removeAddressMapping(String user,String domain, String address) throws VirtualUserTableManagementException;
/**
* Add error mapping
@@ -84,9 +84,9 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param error the regex.
* @return true if successfully
- * @throws InvalidMappingException get thrown if an invalid argument was given
+ * @throws VirtualUserTableManagementException get thrown if an invalid argument was given
*/
- public boolean addErrorMapping(String user, String domain, String error) throws InvalidMappingException;
+ public boolean addErrorMapping(String user, String domain, String error) throws VirtualUserTableManagementException;
/**
* Remove error mapping
@@ -95,9 +95,9 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param error
* @return true if successfully
- * @throws InvalidMappingException get thrown if an invalid argument was given
+ * @throws VirtualUserTableManagementException get thrown if an invalid argument was given
*/
- public boolean removeErrorMapping(String user,String domain, String error) throws InvalidMappingException;
+ public boolean removeErrorMapping(String user,String domain, String error) throws VirtualUserTableManagementException;
/**
* Return the explicit mapping stored for the given user and domain. Return null
@@ -106,9 +106,9 @@ public interface VirtualUserTableManagem
* @param user the username
* @param domain the domain
* @return the collection which holds the mappings.
- * @throws InvalidMappingException get thrown if an invalid use or domain was given
+ * @throws VirtualUserTableManagementException get thrown if an invalid use or domain was given
*/
- public Collection<String> getUserDomainMappings(String user, String domain) throws InvalidMappingException;
+ public Collection<String> getUserDomainMappings(String user, String domain) throws VirtualUserTableManagementException;
/**
* Add mapping
@@ -117,9 +117,9 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param mapping the mapping
* @return true if successfully
- * @throws InvalidMappingException
+ * @throws VirtualUserTableManagementException
*/
- public boolean addMapping(String user, String domain, String mapping) throws InvalidMappingException;
+ public boolean addMapping(String user, String domain, String mapping) throws VirtualUserTableManagementException;
/**
* Remove mapping
@@ -128,9 +128,9 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param mapping the mapping
* @return true if successfully
- * @throws InvalidMappingException
+ * @throws VirtualUserTableManagementException
*/
- public boolean removeMapping(String user, String domain, String mapping) throws InvalidMappingException;
+ public boolean removeMapping(String user, String domain, String mapping) throws VirtualUserTableManagementException;
/**
@@ -147,9 +147,9 @@ public interface VirtualUserTableManagem
* @param aliasDomain the aliasdomain which should be mapped to the realDomain
* @param realDomain the realDomain
* @return true if successfilly
- * @throws InvalidMappingException
+ * @throws VirtualUserTableManagementException
*/
- public boolean addAliasDomainMapping(String aliasDomain, String realDomain) throws InvalidMappingException;
+ public boolean addAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableManagementException;
/**
* Remove aliasDomain mapping
@@ -157,7 +157,7 @@ public interface VirtualUserTableManagem
* @param aliasDomain the aliasdomain which should be mapped to the realDomain
* @param realDomain the realDomain
* @return true if successfilly
- * @throws InvalidMappingException
+ * @throws VirtualUserTableManagementException
*/
- public boolean removeAliasDomainMapping(String aliasDomain, String realDomain) throws InvalidMappingException;
+ public boolean removeAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableManagementException;
}
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java Tue Oct 12 05:34:41 2010
@@ -37,84 +37,78 @@ public interface VirtualUserTableManagem
* @phoenix:mx-operation
* @phoenix:mx-description Add regex mapping
*
- * @param virtualUserTable The virtualUserTable
* @param user the username. Null if no username should be used
* @param domain the domain. Null if no domain should be used
* @param regex the regex.
* @return true if successfully
* @throws VirtualUserTableManagementException TODO
*/
- public boolean addRegexMapping(String virtualUserTable, String user, String domain, String regex) throws VirtualUserTableManagementException;
+ public boolean addRegexMapping(String user, String domain, String regex) throws VirtualUserTableManagementException;
/**
* Remove regex mapping
* @phoenix:mx-operation
* @phoenix:mx-description Remove regex mapping
*
- * @param virtualUserTable The virtualUserTable
* @param user the username. Null if no username should be used
* @param domain the domain. Null if no domain should be used
* @param regex the regex.
* @return true if successfully
* @throws VirtualUserTableManagementException TODO
*/
- public boolean removeRegexMapping(String virtualUserTable, String user,String domain, String regex) throws VirtualUserTableManagementException;
+ public boolean removeRegexMapping(String user,String domain, String regex) throws VirtualUserTableManagementException;
/***
* Add address mapping
* @phoenix:mx-operation
* @phoenix:mx-description Add address mapping
*
- * @param virtualUserTable The virtualUserTable
* @param user the username. Null if no username should be used
* @param domain the domain. Null if no domain should be used
* @param address the address.
* @return true if successfully
* @throws VirtualUserTableManagementException TODO
*/
- public boolean addAddressMapping(String virtualUserTable, String user, String domain, String address) throws VirtualUserTableManagementException;
+ public boolean addAddressMapping(String user, String domain, String address) throws VirtualUserTableManagementException;
/**
* Remove address mapping
* @phoenix:mx-operation
* @phoenix:mx-description Remove address mapping
*
- * @param virtualUserTable The virtualUserTable
* @param user the username. Null if no username should be used
* @param domain the domain. Null if no domain should be used
* @param address
* @return true if successfully
* @throws VirtualUserTableManagementException TODO
*/
- public boolean removeAddressMapping(String virtualUserTable, String user,String domain, String address) throws VirtualUserTableManagementException;
+ public boolean removeAddressMapping(String user,String domain, String address) throws VirtualUserTableManagementException;
/**
* Add error mapping
* @phoenix:mx-operation
* @phoenix:mx-description Add error mapping
*
- * @param virtualUserTable The virtualUserTable
* @param user the username. Null if no username should be used
* @param domain the domain. Null if no domain should be used
* @param error
* @return true if successfully
* @throws VirtualUserTableManagementException TODO
*/
- public boolean addErrorMapping(String virtualUserTable, String user, String domain, String error) throws VirtualUserTableManagementException;
+ public boolean addErrorMapping(String user, String domain, String error) throws VirtualUserTableManagementException;
/**
* Remove error mapping
* @phoenix:mx-operation
* @phoenix:mx-description Remove error mapping
*
- * @param virtualUserTable The virtualUserTable
* @param user the username. Null if no username should be used
* @param domain the domain. Null if no domain should be used
* @param error
* @return true if successfully
* @throws VirtualUserTableManagementException TODO
*/
- public boolean removeErrorMapping(String virtualUserTable, String user,String domain, String error) throws VirtualUserTableManagementException;
+ public boolean removeErrorMapping(String user,String domain, String error) throws VirtualUserTableManagementException;
/**
* Return the explicit mapping stored for the given user and domain. Return null
@@ -123,39 +117,36 @@ public interface VirtualUserTableManagem
* @phoenix:mx-description Return the explicit mapping stored for the given user and domain. Return null
* if no mapping was found
*
- * @param virtualUserTable The virtualUserTable
* @param user the username
* @param domain the domain
* @return the collection which holds the mappings.
* @throws VirtualUserTableManagementException TODO
*/
- public Collection<String> getUserDomainMappings(String virtualUserTable, String user, String domain) throws VirtualUserTableManagementException;
+ public Collection<String> getUserDomainMappings(String user, String domain) throws VirtualUserTableManagementException;
/**
* Try to identify the right method based on the prefix of the mapping and add it.
* @phoenix:mx-operation
* @phoenix:mx-description Try to identify the right method based on the prefix of the mapping and add it
*
- * @param virtualUserTable The virtualUserTable
* @param user the username. Null if no username should be used
* @param domain the domain. Null if no domain should be used
* @param mapping the mapping.
* @return true if successfully
* @throws VirtualUserTableManagementException TODO
*/
- public boolean addMapping(String virtualUserTable, String user, String domain, String mapping) throws VirtualUserTableManagementException;
+ public boolean addMapping(String user, String domain, String mapping) throws VirtualUserTableManagementException;
/**
* Try to identify the right method based on the prefix of the mapping and remove it.
* @phoenix:mx-operation
* @phoenix:mx-description Try to identify the right method based on the prefix of the mapping and remove it
*
- * @param virtualUserTable The virtualUserTable
* @param user the username. Null if no username should be used
* @param domain the domain. Null if no domain should be used
* @param mapping the mapping.
* @return true if successfully
* @throws VirtualUserTableManagementException TODO
*/
- public boolean removeMapping(String virtualUserTable, String user, String domain, String mapping) throws VirtualUserTableManagementException;
+ public boolean removeMapping(String user, String domain, String mapping) throws VirtualUserTableManagementException;
}
Modified: james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Tue Oct 12 05:34:41 2010
@@ -36,7 +36,7 @@ import javax.sql.DataSource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.services.DataSourceSelector;
@@ -228,7 +228,7 @@ public class JDBCVirtualUserTable extend
/**
* @see org.apache.james.impl.vut.AbstractVirtualUserTable#addMappingInternal(String, String, String)
*/
- protected boolean addMappingInternal(String user, String domain, String regex) throws InvalidMappingException {
+ protected boolean addMappingInternal(String user, String domain, String regex) throws VirtualUserTableManagementException {
String newUser = getUserString(user);
String newDomain = getDomainString(domain);
@@ -339,7 +339,7 @@ public class JDBCVirtualUserTable extend
/**
* @see org.apache.james.impl.vut.AbstractVirtualUserTable#removeMappingInternal(String, String, String)
*/
- protected boolean removeMappingInternal(String user, String domain, String mapping) throws InvalidMappingException {
+ protected boolean removeMappingInternal(String user, String domain, String mapping) throws VirtualUserTableManagementException {
String newUser = getUserString(user);
String newDomain = getDomainString(domain);
Collection<String> map = getUserDomainMappings(newUser,newDomain);
@@ -476,12 +476,12 @@ public class JDBCVirtualUserTable extend
* @return user the user String
* @throws InvalidMappingException get thrown on invalid argument
*/
- private String getUserString(String user) throws InvalidMappingException {
+ private String getUserString(String user) throws VirtualUserTableManagementException {
if (user != null) {
if(user.equals(WILDCARD) || user.indexOf("@") < 0) {
return user;
} else {
- throw new InvalidMappingException("Invalid user: " + user);
+ throw new VirtualUserTableManagementException("Invalid user: " + user);
}
} else {
return WILDCARD;
@@ -495,12 +495,12 @@ public class JDBCVirtualUserTable extend
* @return domainString the domain String
* @throws InvalidMappingException get thrown on invalid argument
*/
- private String getDomainString(String domain) throws InvalidMappingException {
+ private String getDomainString(String domain) throws VirtualUserTableManagementException {
if(domain != null) {
if (domain.equals(WILDCARD) || domain.indexOf("@") < 0) {
return domain;
} else {
- throw new InvalidMappingException("Invalid domain: " + domain);
+ throw new VirtualUserTableManagementException("Invalid domain: " + domain);
}
} else {
return WILDCARD;
Modified: james/server/trunk/user-function/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/user-function/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java Tue Oct 12 05:34:41 2010
@@ -29,7 +29,7 @@ import javax.persistence.EntityTransacti
import javax.persistence.PersistenceException;
import javax.persistence.PersistenceUnit;
-import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.vut.model.JPAVirtualUser;
@@ -57,7 +57,7 @@ public class JPAVirtualUserTable extends
/**
* @see org.apache.james.impl.vut.AbstractVirtualUserTable#addMappingInternal(String, String, String)
*/
- protected boolean addMappingInternal(String user, String domain, String regex) throws InvalidMappingException {
+ protected boolean addMappingInternal(String user, String domain, String regex) throws VirtualUserTableManagementException {
String newUser = getUserString(user);
String newDomain = getDomainString(domain);
@@ -153,7 +153,7 @@ public class JPAVirtualUserTable extends
/**
* @see org.apache.james.impl.vut.AbstractVirtualUserTable#removeMappingInternal(String, String, String)
*/
- protected boolean removeMappingInternal(String user, String domain, String mapping) throws InvalidMappingException {
+ protected boolean removeMappingInternal(String user, String domain, String mapping) throws VirtualUserTableManagementException {
String newUser = getUserString(user);
String newDomain = getDomainString(domain);
Collection<String> map = getUserDomainMappings(newUser,newDomain);
@@ -265,12 +265,12 @@ public class JPAVirtualUserTable extends
* @return user the user String
* @throws InvalidMappingException get thrown on invalid argument
*/
- private String getUserString(String user) throws InvalidMappingException {
+ private String getUserString(String user) throws VirtualUserTableManagementException {
if (user != null) {
if(user.equals(WILDCARD) || user.indexOf("@") < 0) {
return user;
} else {
- throw new InvalidMappingException("Invalid user: " + user);
+ throw new VirtualUserTableManagementException("Invalid user: " + user);
}
} else {
return WILDCARD;
@@ -284,12 +284,12 @@ public class JPAVirtualUserTable extends
* @return domainString the domain String
* @throws InvalidMappingException get thrown on invalid argument
*/
- private String getDomainString(String domain) throws InvalidMappingException {
+ private String getDomainString(String domain) throws VirtualUserTableManagementException {
if(domain != null) {
if (domain.equals(WILDCARD) || domain.indexOf("@") < 0) {
return domain;
} else {
- throw new InvalidMappingException("Invalid domain: " + domain);
+ throw new VirtualUserTableManagementException("Invalid domain: " + domain);
}
} else {
return WILDCARD;
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Tue Oct 12 05:34:41 2010
@@ -20,7 +20,7 @@ package org.apache.james.vut;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.services.MockFileSystem;
import org.apache.james.util.TestUtil;
@@ -49,7 +49,7 @@ public class JDBCVirtualUserTableTest ex
/**
* @see org.apache.james.vut.AbstractVirtualUserTableTest#addMapping(java.lang.String, java.lang.String, java.lang.String, int)
*/
- protected boolean addMapping(String user, String domain, String mapping, int type) throws InvalidMappingException {
+ protected boolean addMapping(String user, String domain, String mapping, int type) throws VirtualUserTableManagementException {
if (type == ERROR_TYPE) {
return virtualUserTable.addErrorMapping(user, domain, mapping);
} else if (type == REGEX_TYPE) {
@@ -66,7 +66,7 @@ public class JDBCVirtualUserTableTest ex
/**
* @see org.apache.james.vut.AbstractVirtualUserTableTest#removeMapping(java.lang.String, java.lang.String, java.lang.String, int)
*/
- protected boolean removeMapping(String user, String domain, String mapping, int type) throws InvalidMappingException {
+ protected boolean removeMapping(String user, String domain, String mapping, int type) throws VirtualUserTableManagementException {
if (type == ERROR_TYPE) {
return virtualUserTable.removeErrorMapping(user, domain, mapping);
} else if (type == REGEX_TYPE) {
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java Tue Oct 12 05:34:41 2010
@@ -22,7 +22,7 @@ import java.util.HashMap;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.vut.model.JPAVirtualUser;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
@@ -76,7 +76,7 @@ public class JPAVirtualUserTableTest ext
/**
* @see org.apache.james.vut.AbstractVirtualUserTableTest#addMapping(java.lang.String, java.lang.String, java.lang.String, int)
*/
- protected boolean addMapping(String user, String domain, String mapping, int type) throws InvalidMappingException {
+ protected boolean addMapping(String user, String domain, String mapping, int type) throws VirtualUserTableManagementException {
if (type == ERROR_TYPE) {
return virtualUserTable.addErrorMapping(user, domain, mapping);
} else if (type == REGEX_TYPE) {
@@ -93,7 +93,7 @@ public class JPAVirtualUserTableTest ext
/**
* @see org.apache.james.vut.AbstractVirtualUserTableTest#removeMapping(java.lang.String, java.lang.String, java.lang.String, int)
*/
- protected boolean removeMapping(String user, String domain, String mapping, int type) throws InvalidMappingException {
+ protected boolean removeMapping(String user, String domain, String mapping, int type) throws VirtualUserTableManagementException {
if (type == ERROR_TYPE) {
return virtualUserTable.removeErrorMapping(user, domain, mapping);
} else if (type == REGEX_TYPE) {
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?rev=1021633&r1=1021632&r2=1021633&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java Tue Oct 12 05:34:41 2010
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.vut.VirtualUserTable;
-import org.apache.james.api.vut.management.InvalidMappingException;
+import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.impl.vut.VirtualUserTableUtil;
@@ -51,7 +51,7 @@ public class XMLVirtualUserTableTest ext
/**
* @see org.apache.james.vut.AbstractVirtualUserTableTest#addMapping(java.lang.String, java.lang.String, java.lang.String, int)
*/
- protected boolean addMapping(String user, String domain, String mapping, int type) throws InvalidMappingException {
+ protected boolean addMapping(String user, String domain, String mapping, int type) throws VirtualUserTableManagementException {
Collection<String> mappings = virtualUserTable.getUserDomainMappings(user, domain);
@@ -92,7 +92,7 @@ public class XMLVirtualUserTableTest ext
/**
* @see org.apache.james.vut.AbstractVirtualUserTableTest#removeMapping(java.lang.String, java.lang.String, java.lang.String, int)
*/
- protected boolean removeMapping(String user, String domain, String mapping, int type) throws InvalidMappingException {
+ protected boolean removeMapping(String user, String domain, String mapping, int type) throws VirtualUserTableManagementException {
Collection<String> mappings = virtualUserTable.getUserDomainMappings(user, domain);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org