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/25 13:42:33 UTC
svn commit: r1027073 [2/2] - in /james/server/trunk:
container-spring/src/main/config/james/
mailets/src/main/java/org/apache/james/transport/mailets/
mailets/src/test/java/org/apache/james/transport/mailets/
remotemanager/src/main/java/org/apache/jame...
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java?rev=1027073&r1=1027072&r2=1027073&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java Mon Oct 25 11:42:31 2010
@@ -21,13 +21,14 @@
package org.apache.james.vut.lib;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
import javax.annotation.Resource;
+import javax.management.NotCompliantMBeanException;
+import javax.management.StandardMBean;
-import org.apache.james.vut.api.ManageableVirtualUserTableException;
+import org.apache.james.vut.api.VirtualUserTable;
import org.apache.james.vut.api.VirtualUserTableManagementMBean;
@@ -35,12 +36,17 @@ import org.apache.james.vut.api.VirtualU
* Management for VirtualUserTables
*
*/
-public class VirtualUserTableManagement implements VirtualUserTableManagementMBean {
+public class VirtualUserTableManagement extends StandardMBean implements VirtualUserTableManagementMBean {
+
+ protected VirtualUserTableManagement() throws NotCompliantMBeanException {
+ super(VirtualUserTableManagementMBean.class);
+ }
- private org.apache.james.vut.api.ManageableVirtualUserTable vut;
- @Resource(name="manageablevirtualusertable")
- public void setManageableVirtualUserTable(org.apache.james.vut.api.ManageableVirtualUserTable vut) {
+ private VirtualUserTable vut;
+
+ @Resource(name="virtualusertable")
+ public void setManageableVirtualUserTable(VirtualUserTable vut) {
this.vut = vut;
}
@@ -50,11 +56,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#addAddressMapping(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean addAddressMapping(String user, String domain, String address) {
- try {
- return vut.addAddressMapping(user, domain, address);
- } catch (ManageableVirtualUserTableException e) {
- return false;
- }
+ return vut.addAddressMapping(user, domain, address);
}
/*
@@ -62,11 +64,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#addErrorMapping(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean addErrorMapping(String user, String domain, String error) {
- try {
- return vut.addErrorMapping(user, domain, error);
- } catch (ManageableVirtualUserTableException e){
- return false;
- }
+ return vut.addErrorMapping(user, domain, error);
}
@@ -75,11 +73,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#addRegexMapping(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean addRegexMapping(String user, String domain, String regex) {
- try {
- return vut.addRegexMapping(user, domain, regex);
- } catch (ManageableVirtualUserTableException e) {
- return false;
- }
+ return vut.addRegexMapping(user, domain, regex);
}
@@ -88,11 +82,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#getUserDomainMappings(java.lang.String, java.lang.String)
*/
public Collection<String> getUserDomainMappings(String user, String domain) {
- try {
- return vut.getUserDomainMappings(user, domain);
- } catch (ManageableVirtualUserTableException e) {
- return new ArrayList<String>();
- }
+ return vut.getUserDomainMappings(user, domain);
}
@@ -101,11 +91,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#removeErrorMapping(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean removeErrorMapping(String user, String domain, String error) {
- try {
- return vut.removeErrorMapping(user, domain, error);
- } catch (ManageableVirtualUserTableException e) {
- return false;
- }
+ return vut.removeErrorMapping(user, domain, error);
}
/*
@@ -113,11 +99,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#removeRegexMapping(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean removeRegexMapping(String user, String domain, String regex) {
- try {
- return vut.removeRegexMapping(user, domain, regex);
- } catch (ManageableVirtualUserTableException e) {
- return false;
- }
+ return vut.removeRegexMapping(user, domain, regex);
}
@@ -126,11 +108,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#addMapping(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean addMapping(String user, String domain, String mapping) {
- try {
- return vut.addMapping(user, domain, mapping);
- } catch (ManageableVirtualUserTableException e) {
- return false;
- }
+ return vut.addMapping(user, domain, mapping);
}
@@ -139,11 +117,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#removeMapping(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean removeMapping(String user, String domain, String mapping) {
- try {
- return vut.removeMapping(user, domain, mapping);
- } catch (ManageableVirtualUserTableException e) {
- return false;
- }
+ return vut.removeMapping(user, domain, mapping);
}
@@ -152,12 +126,7 @@ public class VirtualUserTableManagement
* @see org.apache.james.api.vut.management.VirtualUserTableManagementMBean#removeAddressMapping(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean removeAddressMapping(String user, String domain, String address) {
- try {
- return vut.removeAddressMapping(user, domain, address);
- } catch (ManageableVirtualUserTableException e) {
- return false;
- }
-
+ return vut.removeAddressMapping(user, domain, address);
}
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java?rev=1027073&r1=1027072&r2=1027073&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java Mon Oct 25 11:42:31 2010
@@ -20,7 +20,7 @@
package org.apache.james.user.lib;
import org.apache.james.user.api.User;
-import org.apache.james.user.lib.AbstractUsersRepository;
+import org.apache.james.user.lib.AbstractJamesUsersRepository;
import org.apache.james.user.lib.DefaultJamesUser;
import org.apache.james.user.lib.DefaultUser;
import org.apache.james.user.lib.util.DigestUtil;
@@ -32,7 +32,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
-public class MockUsersRepository extends AbstractUsersRepository {
+public class MockUsersRepository extends AbstractJamesUsersRepository {
private final HashMap<String,User> m_users = new HashMap<String,User>();
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java?rev=1027073&r1=1027072&r2=1027073&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/AbstractVirtualUserTableTest.java Mon Oct 25 11:42:31 2010
@@ -25,9 +25,8 @@ import java.util.Map;
import junit.framework.TestCase;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.vut.api.ErrorMappingException;
-import org.apache.james.vut.api.ManageableVirtualUserTableException;
import org.apache.james.vut.api.VirtualUserTable;
+import org.apache.james.vut.api.VirtualUserTable.ErrorMappingException;
import org.apache.james.vut.lib.AbstractVirtualUserTable;
/**
@@ -67,7 +66,7 @@ public abstract class AbstractVirtualUse
while (mapIt.hasNext()) {
try {
removeMapping(args[0], args[1], mapIt.next().toString());
- } catch (ManageableVirtualUserTableException e) {
+ } catch (IllegalArgumentException e) {
e.printStackTrace();
}
}
@@ -78,7 +77,7 @@ public abstract class AbstractVirtualUse
}
- public void testStoreAndRetrieveRegexMapping() throws ErrorMappingException {
+ public void testStoreAndRetrieveRegexMapping() throws org.apache.james.vut.api.VirtualUserTable.ErrorMappingException {
String user = "test";
String domain = "localhost";
@@ -100,7 +99,7 @@ public abstract class AbstractVirtualUse
try {
assertTrue("Added virtual mapping", virtualUserTable.addRegexMapping(user, domain, invalidRegex));
- } catch (ManageableVirtualUserTableException e) {
+ } catch (IllegalArgumentException e) {
catched = true;
}
assertTrue("Invalid Mapping throw exception" , catched);
@@ -111,7 +110,7 @@ public abstract class AbstractVirtualUse
assertNull("No mappings", virtualUserTable.getAllMappings());
- } catch (ManageableVirtualUserTableException e) {
+ } catch (IllegalArgumentException e) {
fail("Storing failed");
}
@@ -155,7 +154,7 @@ public abstract class AbstractVirtualUse
assertNull("No mapping", virtualUserTable.getMappings(user, domain));
assertNull("No mappings", virtualUserTable.getAllMappings());
- } catch (ManageableVirtualUserTableException e) {
+ } catch (IllegalArgumentException e) {
fail("Storing failed");
}
@@ -187,7 +186,7 @@ public abstract class AbstractVirtualUse
assertNull("No mapping", virtualUserTable.getMappings(user, domain));
assertNull("No mappings", virtualUserTable.getAllMappings());
- } catch (ManageableVirtualUserTableException e) {
+ } catch (IllegalArgumentException e) {
fail("Storing failed");
}
@@ -216,7 +215,7 @@ public abstract class AbstractVirtualUse
assertNull("No mapping", virtualUserTable.getMappings(user, domain));
assertNull("No mapping", virtualUserTable.getMappings(user2, domain));
- } catch (ManageableVirtualUserTableException e) {
+ } catch (IllegalArgumentException e) {
fail("Storing failed");
}
@@ -253,7 +252,7 @@ public abstract class AbstractVirtualUse
virtualUserTable.setRecursiveMapping(false);
assertEquals("Not recursive mapped", virtualUserTable.getMappings(user1, domain1).iterator().next(),user2 + "@" + domain2);
- } catch (ManageableVirtualUserTableException e) {
+ } catch (IllegalArgumentException e) {
fail("Storing failed");
}
}
@@ -280,7 +279,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 (ManageableVirtualUserTableException e) {
+ } catch (IllegalArgumentException e) {
fail("Storing failed");
}
@@ -288,11 +287,11 @@ public abstract class AbstractVirtualUse
protected abstract AbstractVirtualUserTable getVirtualUserTable() throws Exception;
- protected abstract boolean addMapping(String user , String domain, String mapping,int type)throws ManageableVirtualUserTableException;
+ protected abstract boolean addMapping(String user , String domain, String mapping,int type);
- protected abstract boolean removeMapping(String user, String domain, String mapping, int type) throws ManageableVirtualUserTableException;
+ protected abstract boolean removeMapping(String user, String domain, String mapping, int type);
- private void removeMapping(String user, String domain, String rawMapping) throws ManageableVirtualUserTableException {
+ private void removeMapping(String user, String domain, String rawMapping) {
if (rawMapping.startsWith(VirtualUserTable.ERROR_PREFIX)) {
removeMapping(user, domain, rawMapping.substring(VirtualUserTable.ERROR_PREFIX.length()), ERROR_TYPE);
} else if (rawMapping.startsWith(VirtualUserTable.REGEX_PREFIX)) {
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java?rev=1027073&r1=1027072&r2=1027073&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java Mon Oct 25 11:42:31 2010
@@ -24,25 +24,22 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.vut.api.ErrorMappingException;
-import org.apache.james.vut.api.ManageableVirtualUserTable;
-import org.apache.james.vut.api.ManageableVirtualUserTableException;
import org.apache.james.vut.api.VirtualUserTable;
import org.apache.james.vut.lib.VirtualUserTableUtil;
-public class MockVirtualUserTableManagementImpl implements ManageableVirtualUserTable {
+public class MockVirtualUserTableManagementImpl implements VirtualUserTable {
HashMap store = new HashMap();
- public boolean addAddressMapping(String user, String domain, String address) throws ManageableVirtualUserTableException {
+ public boolean addAddressMapping(String user, String domain, String address) {
return addRawMapping(user,domain,address);
}
- public boolean addErrorMapping(String user, String domain, String error) throws ManageableVirtualUserTableException {
+ public boolean addErrorMapping(String user, String domain, String error) {
return addRawMapping(user,domain,VirtualUserTable.ERROR_PREFIX + error);
}
- public boolean addMapping(String user, String domain, String mapping) throws ManageableVirtualUserTableException {
+ public boolean addMapping(String user, String domain, String mapping) {
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 +49,7 @@ public class MockVirtualUserTableManagem
}
}
- public boolean addRegexMapping(String user, String domain, String regex) throws ManageableVirtualUserTableException {
+ public boolean addRegexMapping(String user, String domain, String regex) {
return addRawMapping(user,domain,VirtualUserTable.REGEX_PREFIX + regex);
}
@@ -64,7 +61,7 @@ public class MockVirtualUserTableManagem
}
}
- public Collection getUserDomainMappings(String user, String domain) throws ManageableVirtualUserTableException {
+ public Collection getUserDomainMappings(String user, String domain) {
String mapping = (String) store.get(user + "@" + domain);
if (mapping != null) {
return VirtualUserTableUtil.mappingToCollection(mapping);
@@ -73,15 +70,15 @@ public class MockVirtualUserTableManagem
}
}
- public boolean removeAddressMapping(String user, String domain, String address) throws ManageableVirtualUserTableException {
+ public boolean removeAddressMapping(String user, String domain, String address) {
return removeRawMapping(user,domain,address);
}
- public boolean removeErrorMapping(String user, String domain, String error) throws ManageableVirtualUserTableException {
+ public boolean removeErrorMapping(String user, String domain, String error) {
return removeRawMapping(user,domain,VirtualUserTable.ERROR_PREFIX + error);
}
- public boolean removeMapping(String user, String domain, String mapping) throws ManageableVirtualUserTableException {
+ public boolean removeMapping(String user, String domain, String mapping) {
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 +88,7 @@ public class MockVirtualUserTableManagem
}
}
- public boolean removeRegexMapping(String user, String domain, String regex) throws ManageableVirtualUserTableException {
+ public boolean removeRegexMapping(String user, String domain, String regex) {
return removeRawMapping(user,domain,VirtualUserTable.REGEX_PREFIX + regex);
}
@@ -134,11 +131,11 @@ public class MockVirtualUserTableManagem
return false;
}
- public boolean addAliasDomainMapping(String aliasDomain, String realDomain) throws ManageableVirtualUserTableException {
+ public boolean addAliasDomainMapping(String aliasDomain, String realDomain) {
return addRawMapping(null,aliasDomain,VirtualUserTable.ALIASDOMAIN_PREFIX + realDomain);
}
- public boolean removeAliasDomainMapping(String aliasDomain, String realDomain) throws ManageableVirtualUserTableException {
+ public boolean removeAliasDomainMapping(String aliasDomain, String realDomain) {
return removeRawMapping(null,aliasDomain,VirtualUserTable.ALIASDOMAIN_PREFIX + realDomain);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org