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/16 20:36:41 UTC
svn commit: r1023349 [2/2] - in /james/server/trunk:
remotemanager/src/main/java/org/apache/james/remotemanager/core/
spring-deployment/src/main/config/james/
user-api/src/main/java/org/apache/james/api/user/management/
user-api/src/main/java/org/apach...
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java?rev=1023349&r1=1023348&r2=1023349&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java Sat Oct 16 18:36:40 2010
@@ -25,24 +25,24 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.james.api.vut.ErrorMappingException;
+import org.apache.james.api.vut.ManageableVirtualUserTableException;
import org.apache.james.api.vut.VirtualUserTable;
-import org.apache.james.api.vut.management.VirtualUserTableManagement;
-import org.apache.james.api.vut.management.VirtualUserTableManagementException;
+import org.apache.james.api.vut.ManageableVirtualUserTable;
import org.apache.james.impl.vut.VirtualUserTableUtil;
-public class MockVirtualUserTableManagementImpl implements VirtualUserTableManagement {
+public class MockVirtualUserTableManagementImpl implements ManageableVirtualUserTable {
HashMap store = new HashMap();
- public boolean addAddressMapping(String user, String domain, String address) throws VirtualUserTableManagementException {
+ public boolean addAddressMapping(String user, String domain, String address) throws ManageableVirtualUserTableException {
return addRawMapping(user,domain,address);
}
- public boolean addErrorMapping(String user, String domain, String error) throws VirtualUserTableManagementException {
+ public boolean addErrorMapping(String user, String domain, String error) throws ManageableVirtualUserTableException {
return addRawMapping(user,domain,VirtualUserTable.ERROR_PREFIX + error);
}
- public boolean addMapping(String user, String domain, String mapping) throws VirtualUserTableManagementException {
+ public boolean addMapping(String user, String domain, String mapping) throws ManageableVirtualUserTableException {
if (mapping.startsWith(VirtualUserTable.ERROR_PREFIX)){
return addErrorMapping(user,domain,mapping.substring(VirtualUserTable.ERROR_PREFIX.length()));
} else if (mapping.startsWith(VirtualUserTable.REGEX_PREFIX)) {
@@ -52,7 +52,7 @@ public class MockVirtualUserTableManagem
}
}
- public boolean addRegexMapping(String user, String domain, String regex) throws VirtualUserTableManagementException {
+ public boolean addRegexMapping(String user, String domain, String regex) throws ManageableVirtualUserTableException {
return addRawMapping(user,domain,VirtualUserTable.REGEX_PREFIX + regex);
}
@@ -64,7 +64,7 @@ public class MockVirtualUserTableManagem
}
}
- public Collection getUserDomainMappings(String user, String domain) throws VirtualUserTableManagementException {
+ public Collection getUserDomainMappings(String user, String domain) throws ManageableVirtualUserTableException {
String mapping = (String) store.get(user + "@" + domain);
if (mapping != null) {
return VirtualUserTableUtil.mappingToCollection(mapping);
@@ -73,15 +73,15 @@ public class MockVirtualUserTableManagem
}
}
- public boolean removeAddressMapping(String user, String domain, String address) throws VirtualUserTableManagementException {
+ public boolean removeAddressMapping(String user, String domain, String address) throws ManageableVirtualUserTableException {
return removeRawMapping(user,domain,address);
}
- public boolean removeErrorMapping(String user, String domain, String error) throws VirtualUserTableManagementException {
+ public boolean removeErrorMapping(String user, String domain, String error) throws ManageableVirtualUserTableException {
return removeRawMapping(user,domain,VirtualUserTable.ERROR_PREFIX + error);
}
- public boolean removeMapping(String user, String domain, String mapping) throws VirtualUserTableManagementException {
+ public boolean removeMapping(String user, String domain, String mapping) throws ManageableVirtualUserTableException {
if (mapping.startsWith(VirtualUserTable.ERROR_PREFIX)){
return removeErrorMapping(user,domain,mapping.substring(VirtualUserTable.ERROR_PREFIX.length()));
} else if (mapping.startsWith(VirtualUserTable.REGEX_PREFIX)) {
@@ -91,7 +91,7 @@ public class MockVirtualUserTableManagem
}
}
- public boolean removeRegexMapping(String user, String domain, String regex) throws VirtualUserTableManagementException {
+ public boolean removeRegexMapping(String user, String domain, String regex) throws ManageableVirtualUserTableException {
return removeRawMapping(user,domain,VirtualUserTable.REGEX_PREFIX + regex);
}
@@ -134,11 +134,11 @@ public class MockVirtualUserTableManagem
return false;
}
- public boolean addAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableManagementException {
+ public boolean addAliasDomainMapping(String aliasDomain, String realDomain) throws ManageableVirtualUserTableException {
return addRawMapping(null,aliasDomain,VirtualUserTable.ALIASDOMAIN_PREFIX + realDomain);
}
- public boolean removeAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableManagementException {
+ public boolean removeAliasDomainMapping(String aliasDomain, String realDomain) throws ManageableVirtualUserTableException {
return removeRawMapping(null,aliasDomain,VirtualUserTable.ALIASDOMAIN_PREFIX + realDomain);
}
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java?rev=1023349&r1=1023348&r2=1023349&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java Sat Oct 16 18:36:40 2010
@@ -25,8 +25,8 @@ import java.util.Map;
import junit.framework.TestCase;
import org.apache.james.api.vut.ErrorMappingException;
+import org.apache.james.api.vut.ManageableVirtualUserTableException;
import org.apache.james.api.vut.VirtualUserTable;
-import org.apache.james.api.vut.management.VirtualUserTableManagementException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.lifecycle.LifecycleUtil;
@@ -67,7 +67,7 @@ public abstract class AbstractVirtualUse
while (mapIt.hasNext()) {
try {
removeMapping(args[0], args[1], mapIt.next().toString());
- } catch (VirtualUserTableManagementException e) {
+ } catch (ManageableVirtualUserTableException e) {
e.printStackTrace();
}
}
@@ -100,7 +100,7 @@ public abstract class AbstractVirtualUse
try {
assertTrue("Added virtual mapping", virtualUserTable.addRegexMapping(user, domain, invalidRegex));
- } catch (VirtualUserTableManagementException e) {
+ } catch (ManageableVirtualUserTableException e) {
catched = true;
}
assertTrue("Invalid Mapping throw exception" , catched);
@@ -111,7 +111,7 @@ public abstract class AbstractVirtualUse
assertNull("No mappings", virtualUserTable.getAllMappings());
- } catch (VirtualUserTableManagementException e) {
+ } catch (ManageableVirtualUserTableException e) {
fail("Storing failed");
}
@@ -155,7 +155,7 @@ public abstract class AbstractVirtualUse
assertNull("No mapping", virtualUserTable.getMappings(user, domain));
assertNull("No mappings", virtualUserTable.getAllMappings());
- } catch (VirtualUserTableManagementException e) {
+ } catch (ManageableVirtualUserTableException e) {
fail("Storing failed");
}
@@ -187,7 +187,7 @@ public abstract class AbstractVirtualUse
assertNull("No mapping", virtualUserTable.getMappings(user, domain));
assertNull("No mappings", virtualUserTable.getAllMappings());
- } catch (VirtualUserTableManagementException e) {
+ } catch (ManageableVirtualUserTableException e) {
fail("Storing failed");
}
@@ -216,7 +216,7 @@ public abstract class AbstractVirtualUse
assertNull("No mapping", virtualUserTable.getMappings(user, domain));
assertNull("No mapping", virtualUserTable.getMappings(user2, domain));
- } catch (VirtualUserTableManagementException e) {
+ } catch (ManageableVirtualUserTableException e) {
fail("Storing failed");
}
@@ -253,7 +253,7 @@ public abstract class AbstractVirtualUse
virtualUserTable.setRecursiveMapping(false);
assertEquals("Not recursive mapped", virtualUserTable.getMappings(user1, domain1).iterator().next(),user2 + "@" + domain2);
- } catch (VirtualUserTableManagementException e) {
+ } catch (ManageableVirtualUserTableException e) {
fail("Storing failed");
}
}
@@ -280,7 +280,7 @@ public abstract class AbstractVirtualUse
assertTrue("Remove mapping", removeMapping(VirtualUserTable.WILDCARD, aliasDomain, user2 + "@" + domain, ADDRESS_TYPE));
assertTrue("Remove aliasDomain mapping", removeMapping(VirtualUserTable.WILDCARD, aliasDomain, domain, ALIASDOMAIN_TYPE));
- } catch (VirtualUserTableManagementException e) {
+ } catch (ManageableVirtualUserTableException e) {
fail("Storing failed");
}
@@ -288,11 +288,11 @@ public abstract class AbstractVirtualUse
protected abstract AbstractVirtualUserTable getVirtualUserTable() throws Exception;
- protected abstract boolean addMapping(String user , String domain, String mapping,int type)throws VirtualUserTableManagementException;
+ protected abstract boolean addMapping(String user , String domain, String mapping,int type)throws ManageableVirtualUserTableException;
- protected abstract boolean removeMapping(String user, String domain, String mapping, int type) throws VirtualUserTableManagementException;
+ protected abstract boolean removeMapping(String user, String domain, String mapping, int type) throws ManageableVirtualUserTableException;
- private void removeMapping(String user, String domain, String rawMapping) throws VirtualUserTableManagementException {
+ private void removeMapping(String user, String domain, String rawMapping) throws ManageableVirtualUserTableException {
if (rawMapping.startsWith(VirtualUserTable.ERROR_PREFIX)) {
removeMapping(user, domain, rawMapping.substring(VirtualUserTable.ERROR_PREFIX.length()), ERROR_TYPE);
} else if (rawMapping.startsWith(VirtualUserTable.REGEX_PREFIX)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org