Author: norman
Date: Thu Jan 6 11:52:16 2011
New Revision: 1055838
URL: http://svn.apache.org/viewvc?rev=1055838&view=rev
Log:
MBeans use standard Exceptions now. See JAMES-1176
Modified:
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
Modified:
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java?rev=1055838&r1=1055837&r2=1055838&view=diff
==============================================================================
---
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java
(original)
+++
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/api/DomainListManagementMBean.java
Thu Jan 6 11:52:16 2011
@@ -22,6 +22,49 @@ package org.apache.james.domainlist.api;
* JMX MBean for DomainList
*
*/
-public interface DomainListManagementMBean extends DomainList{
+public interface DomainListManagementMBean{
+
+ /**
+ * Return array of domains which should be used as localdomains.
+ * Return null if no domain is found.
+ *
+ * @return domains
+ */
+ public String[] getDomains() throws Exception;
+
+ /**
+ * Return true if the domain exists in the service
+ *
+ * @param domain the domain
+ * @return true if the given domain exists in the service
+ */
+ public boolean containsDomain(String domain) throws Exception;
+
+
+ /**
+ * Add domain to the service
+ *
+ * @param domain domain to add
+ * @return true if successfull
+ */
+ public void addDomain(String domain) throws Exception;
+
+ /**
+ * Remove domain from the service
+ *
+ * @param domain domain to remove
+ * @return true if successfull
+ */
+ public void removeDomain(String domain) throws Exception;
+
+
+
+ /**
+ * Return the default domain which will get used to deliver mail to if
only the localpart
+ * was given on rcpt to.
+ *
+ * @return the defaultdomain
+ */
+ public String getDefaultDomain() throws Exception;
}
Modified:
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java?rev=1055838&r1=1055837&r2=1055838&view=diff
==============================================================================
---
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
(original)
+++
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
Thu Jan 6 11:52:16 2011
@@ -26,37 +26,62 @@ import org.apache.james.domainlist.api.D
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.domainlist.api.DomainListManagementMBean;
-public class DomainListManagement extends StandardMBean implements
DomainListManagementMBean{
+public class DomainListManagement extends StandardMBean implements
DomainListManagementMBean {
private DomainList domainList;
public DomainListManagement() throws NotCompliantMBeanException {
super(DomainListManagementMBean.class);
}
-
- @Resource(name="domainlist")
+
+ @Resource(name = "domainlist")
public void setDomainList(DomainList domainList) {
this.domainList = domainList;
+
}
-
- public void addDomain(String domain) throws DomainListException{
- domainList.addDomain(domain);
+
+ public void addDomain(String domain) throws Exception {
+ try {
+ domainList.addDomain(domain);
+ } catch (DomainListException e) {
+ throw new Exception(e.getMessage());
+ }
}
- public boolean containsDomain(String domain) throws DomainListException{
- return domainList.containsDomain(domain);
+ public boolean containsDomain(String domain) throws Exception {
+ try {
+
+ return domainList.containsDomain(domain);
+ } catch (DomainListException e) {
+ throw new Exception(e.getMessage());
+ }
}
- public String[] getDomains() throws DomainListException{
- return domainList.getDomains();
+ public String[] getDomains() throws Exception {
+ try {
+
+ return domainList.getDomains();
+ } catch (DomainListException e) {
+ throw new Exception(e.getMessage());
+ }
}
- public void removeDomain(String domain) throws DomainListException{
- domainList.removeDomain(domain);
+ public void removeDomain(String domain) throws Exception {
+ try {
+
+ domainList.removeDomain(domain);
+ } catch (DomainListException e) {
+ throw new Exception(e.getMessage());
+ }
}
- public String getDefaultDomain() throws DomainListException{
- return domainList.getDefaultDomain();
+ public String getDefaultDomain() throws Exception {
+ try {
+
+ return domainList.getDefaultDomain();
+ } catch (DomainListException e) {
+ throw new Exception(e.getMessage());
+ }
}
}
Modified:
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java?rev=1055838&r1=1055837&r2=1055838&view=diff
==============================================================================
---
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
(original)
+++
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
Thu Jan 6 11:52:16 2011
@@ -35,7 +35,7 @@ public interface UsersRepositoryManageme
* @param userName The name of the user being added
* @param password The password of the user being added
*/
- void addUser(String userName, String password) throws
UsersRepositoryException;
+ void addUser(String userName, String password) throws Exception;
/**
* Deletes a user from this mail server.
@@ -44,7 +44,7 @@ public interface UsersRepositoryManageme
* @param userName The name of the user being deleted
* @throws UsersRepositoryException if error
*/
- void deleteUser(String userName) throws UsersRepositoryException;
+ void deleteUser(String userName) throws Exception;
/**
* Check if a user exists with the given name.
@@ -54,7 +54,7 @@ public interface UsersRepositoryManageme
* @return TRUE, if the user exists
* @throws UsersRepositoryException if error
*/
- boolean verifyExists(String userName) throws UsersRepositoryException;
+ boolean verifyExists(String userName) throws Exception;
/**
* Total count of existing users
@@ -62,7 +62,7 @@ public interface UsersRepositoryManageme
*
* @return Total count of existing users
*/
- long countUsers() throws UsersRepositoryException;
+ long countUsers() throws Exception;
/**
* List the names of all users
@@ -71,7 +71,7 @@ public interface UsersRepositoryManageme
* @return List of all user names
* @throws UsersRepositoryException if error
*/
- String[] listAllUsers() throws UsersRepositoryException;
+ String[] listAllUsers() throws Exception;
/**
* Set a user's password
@@ -81,7 +81,7 @@ public interface UsersRepositoryManageme
* @param password The new password
* @throws UsersRepositoryException if error
*/
- void setPassword(String userName, String password) throws
UsersRepositoryException;
+ void setPassword(String userName, String password) throws Exception;
/**
* Removes a user's alias which terminates local mail forwarding
@@ -91,7 +91,7 @@ public interface UsersRepositoryManageme
* @throws UsersRepositoryException if error
*/
@Deprecated
- void unsetAlias(String userName) throws UsersRepositoryException;
+ void unsetAlias(String userName) throws Exception;
/**
* Retrieves the user's alias, if set
@@ -101,7 +101,7 @@ public interface UsersRepositoryManageme
* @throws UsersRepositoryException if error
*/
@Deprecated
- String getAlias(String userName) throws UsersRepositoryException;
+ String getAlias(String userName) throws Exception;
/**
* Removes a user's forward email address which terminates remote mail
forwarding
@@ -111,7 +111,7 @@ public interface UsersRepositoryManageme
* @throws UsersRepositoryException if error
*/
@Deprecated
- void unsetForwardAddress(String userName) throws UsersRepositoryException;
+ void unsetForwardAddress(String userName) throws Exception;
/**
* Retrieves the user's forward, if set
@@ -122,7 +122,7 @@ public interface UsersRepositoryManageme
* @throws UsersRepositoryException if error
*/
@Deprecated
- String getForwardAddress(String userName) throws UsersRepositoryException;
+ String getForwardAddress(String userName) throws Exception;
/**
@@ -131,5 +131,6 @@ public interface UsersRepositoryManageme
* @return virtual
* @throws UsersRepositoryException
*/
- public boolean getVirtualHostingEnabled() throws UsersRepositoryException;
+ public boolean getVirtualHostingEnabled() throws Exception;
+
}
Modified:
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java?rev=1055838&r1=1055837&r2=1055838&view=diff
==============================================================================
---
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java
(original)
+++
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java
Thu Jan 6 11:52:16 2011
@@ -40,7 +40,7 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param regex the regex.
*/
- public void addRegexMapping(String user, String domain, String regex)
throws VirtualUserTableException;
+ public void addRegexMapping(String user, String domain, String regex)
throws Exception;
/**
* Remove regex mapping
@@ -51,7 +51,7 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param regex the regex.
*/
- public void removeRegexMapping(String user,String domain, String regex)
throws VirtualUserTableException;
+ public void removeRegexMapping(String user,String domain, String regex)
throws Exception;
/***
* Add address mapping
@@ -62,7 +62,7 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param address the address.
*/
- public void addAddressMapping(String user, String domain, String address)
throws VirtualUserTableException;
+ public void addAddressMapping(String user, String domain, String address)
throws Exception;
/**
* Remove address mapping
@@ -73,7 +73,7 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param address
*/
- public void removeAddressMapping(String user,String domain, String
address) throws VirtualUserTableException;
+ public void removeAddressMapping(String user,String domain, String
address) throws Exception;
/**
* Add error mapping
@@ -84,7 +84,7 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param error
*/
- public void addErrorMapping(String user, String domain, String error)
throws VirtualUserTableException;
+ public void addErrorMapping(String user, String domain, String error)
throws Exception;
/**
* Remove error mapping
@@ -96,7 +96,7 @@ public interface VirtualUserTableManagem
* @param error
* @return true if successfully
*/
- public void removeErrorMapping(String user,String domain, String error)
throws VirtualUserTableException;
+ public void removeErrorMapping(String user,String domain, String error)
throws Exception;
/**
* Return the explicit mapping stored for the given user and domain.
Return null
@@ -109,7 +109,7 @@ public interface VirtualUserTableManagem
* @param domain the domain
* @return the collection which holds the mappings.
*/
- public Collection<String> getUserDomainMappings(String user, String
domain) throws VirtualUserTableException;
+ public Collection<String> getUserDomainMappings(String user, String
domain) throws Exception;
/**
* Try to identify the right method based on the prefix of the mapping and
add it.
@@ -120,7 +120,7 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param mapping the mapping.
*/
- public void addMapping(String user, String domain, String mapping) throws
VirtualUserTableException;
+ public void addMapping(String user, String domain, String mapping) throws
Exception;
/**
* Try to identify the right method based on the prefix of the mapping and
remove it.
@@ -131,7 +131,7 @@ public interface VirtualUserTableManagem
* @param domain the domain. Null if no domain should be used
* @param mapping the mapping.
*/
- public void removeMapping(String user, String domain, String mapping)
throws VirtualUserTableException;
+ public void removeMapping(String user, String domain, String mapping)
throws Exception;
/**
@@ -140,5 +140,5 @@ public interface VirtualUserTableManagem
*
* @return Map which holds all mappings
*/
- public Map<String,Collection<String>> getAllMappings() throws
VirtualUserTableException;
+ public Map<String,Collection<String>> getAllMappings() throws Exception;
}
Modified:
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java?rev=1055838&r1=1055837&r2=1055838&view=diff
==============================================================================
---
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
(original)
+++
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
Thu Jan 6 11:52:16 2011
@@ -67,16 +67,24 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#addUser(java.lang.String,
java.lang.String)
*/
- public void addUser(String userName, String password) throws
UsersRepositoryException {
- localUsers.addUser(userName, password);
+ public void addUser(String userName, String password) throws Exception {
+ try {
+ localUsers.addUser(userName, password);
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#deleteUser(java.lang.String)
*/
- public void deleteUser(String userName) throws UsersRepositoryException {
- localUsers.removeUser(userName);
+ public void deleteUser(String userName) throws Exception {
+ try {
+ localUsers.removeUser(userName);
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+ }
}
@@ -84,8 +92,12 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#verifyExists(java.lang.String)
*/
- public boolean verifyExists(String userName) throws
UsersRepositoryException {
- return localUsers.contains(userName);
+ public boolean verifyExists(String userName) throws Exception {
+ try {
+ return localUsers.contains(userName);
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+ }
}
@@ -93,8 +105,12 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#countUsers()
*/
- public long countUsers() throws UsersRepositoryException {
- return localUsers.countUsers();
+ public long countUsers() throws Exception {
+ try {
+ return localUsers.countUsers();
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+ }
}
@@ -103,10 +119,15 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#listAllUsers()
*/
- public String[] listAllUsers() throws UsersRepositoryException {
+ public String[] listAllUsers() throws Exception {
List<String> userNames = new ArrayList<String>();
- for (Iterator<String> it = localUsers.list(); it.hasNext();) {
- userNames.add(it.next());
+ try {
+ for (Iterator<String> it = localUsers.list(); it.hasNext();) {
+ userNames.add(it.next());
+ }
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+
}
return (String[])userNames.toArray(new String[]{});
}
@@ -117,13 +138,19 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#setPassword(java.lang.String,
java.lang.String)
*/
- public void setPassword(String userName, String password) throws
UsersRepositoryException {
- User user = localUsers.getUserByName(userName);
- if (user == null) throw new UsersRepositoryException("user not found:
" + userName);
- if (user.setPassword(password) == false) {
- throw new UsersRepositoryException("Unable to update password for
user " + user);
+ public void setPassword(String userName, String password) throws Exception
{
+ try {
+ User user = localUsers.getUserByName(userName);
+ if (user == null) throw new UsersRepositoryException("user not
found: " + userName);
+ if (user.setPassword(password) == false) {
+ throw new UsersRepositoryException("Unable to update password
for user " + user);
+ }
+ localUsers.updateUser(user);
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+
}
- localUsers.updateUser(user);
+
}
@@ -131,12 +158,18 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#unsetAlias(java.lang.String)
*/
- public void unsetAlias(String userName) throws UsersRepositoryException {
- JamesUser user = getJamesUser(userName);
- if (!user.getAliasing()) throw new UsersRepositoryException("User " +
user + " is no alias");
-
- user.setAliasing(false);
- localUsers.updateUser(user);
+ public void unsetAlias(String userName) throws Exception {
+ try {
+ JamesUser user = getJamesUser(userName);
+ if (!user.getAliasing()) throw new UsersRepositoryException("User
" + user + " is no alias");
+
+ user.setAliasing(false);
+ localUsers.updateUser(user);
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+
+ }
+
}
@@ -144,10 +177,16 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#getAlias(java.lang.String)
*/
- public String getAlias(String userName) throws UsersRepositoryException {
- JamesUser user = getJamesUser(userName);
- if (!user.getAliasing()) return null;
- return user.getAlias();
+ public String getAlias(String userName) throws Exception {
+ try {
+ JamesUser user = getJamesUser(userName);
+ if (!user.getAliasing()) return null;
+ return user.getAlias();
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+
+ }
+
}
@@ -155,13 +194,19 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#unsetForwardAddress(java.lang.String)
*/
- public void unsetForwardAddress(String userName) throws
UsersRepositoryException {
- JamesUser user = getJamesUser(userName);
+ public void unsetForwardAddress(String userName) throws Exception {
+ try {
+ JamesUser user = getJamesUser(userName);
+ if (!user.getForwarding()) throw new
UsersRepositoryException("User " + user + " is no forward");
+
+ user.setForwarding(false);
+ localUsers.updateUser(user);
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+
+ }
+
- if (!user.getForwarding()) throw new UsersRepositoryException("User "
+ user + " is no forward");
-
- user.setForwarding(false);
- localUsers.updateUser(user);
}
@@ -169,18 +214,29 @@ public class UsersRepositoryManagement e
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#getForwardAddress(java.lang.String)
*/
- public String getForwardAddress(String userName) throws
UsersRepositoryException {
- JamesUser user = getJamesUser(userName);
- if (!user.getForwarding()) return null;
- return user.getForwardingDestination().toString();
+ public String getForwardAddress(String userName) throws Exception {
+ try {
+ JamesUser user = getJamesUser(userName);
+ if (!user.getForwarding()) return null;
+ return user.getForwardingDestination().toString();
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+
+ }
+
}
/*
* (non-Javadoc)
* @see
org.apache.james.user.api.UsersRepositoryManagementMBean#getVirtualHostingEnabled()
*/
- public boolean getVirtualHostingEnabled() throws UsersRepositoryException {
- return localUsers.supportVirtualHosting();
+ public boolean getVirtualHostingEnabled() throws Exception {
+ try {
+ return localUsers.supportVirtualHosting();
+ } catch (UsersRepositoryException e) {
+ throw new Exception(e.getMessage());
+
+ }
}
}
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=1055838&r1=1055837&r2=1055838&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
Thu Jan 6 11:52:16 2011
@@ -49,82 +49,159 @@ public class VirtualUserTableManagement
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#addRegexMapping(java.lang.String,
java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.vut.api.VirtualUserTableManagementMBean#addRegexMapping
+ * (java.lang.String, java.lang.String, java.lang.String)
*/
- public void addRegexMapping(String user, String domain, String regex)
throws VirtualUserTableException {
- vut.addRegexMapping(user, domain, regex);
+ public void addRegexMapping(String user, String domain, String regex)
throws Exception {
+ try {
+ vut.addRegexMapping(user, domain, regex);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#removeRegexMapping(java.lang.String,
java.lang.String, java.lang.String)
+ *
+ * @see
+ *
org.apache.james.vut.api.VirtualUserTableManagementMBean#removeRegexMapping
+ * (java.lang.String, java.lang.String, java.lang.String)
*/
- public void removeRegexMapping(String user, String domain, String regex)
throws VirtualUserTableException {
- vut.removeRegexMapping(user, domain, regex);
+ public void removeRegexMapping(String user, String domain, String regex)
throws Exception {
+ try {
+
+ vut.removeRegexMapping(user, domain, regex);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#addAddressMapping(java.lang.String,
java.lang.String, java.lang.String)
+ *
+ * @see
+ *
org.apache.james.vut.api.VirtualUserTableManagementMBean#addAddressMapping
+ * (java.lang.String, java.lang.String, java.lang.String)
*/
- public void addAddressMapping(String user, String domain, String address)
throws VirtualUserTableException {
- vut.addAddressMapping(user, domain, address);
+ public void addAddressMapping(String user, String domain, String address)
throws Exception {
+ try {
+
+ vut.addAddressMapping(user, domain, address);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#removeAddressMapping(java.lang.String,
java.lang.String, java.lang.String)
+ *
+ * @see
+ *
org.apache.james.vut.api.VirtualUserTableManagementMBean#removeAddressMapping
+ * (java.lang.String, java.lang.String, java.lang.String)
*/
- public void removeAddressMapping(String user, String domain, String
address) throws VirtualUserTableException {
- vut.removeAddressMapping(user, domain, address);
+ public void removeAddressMapping(String user, String domain, String
address) throws Exception {
+ try {
+
+ vut.removeAddressMapping(user, domain, address);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#addErrorMapping(java.lang.String,
java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.vut.api.VirtualUserTableManagementMBean#addErrorMapping
+ * (java.lang.String, java.lang.String, java.lang.String)
*/
- public void addErrorMapping(String user, String domain, String error)
throws VirtualUserTableException {
- vut.addErrorMapping(user, domain, error);
+ public void addErrorMapping(String user, String domain, String error)
throws Exception {
+ try {
+
+ vut.addErrorMapping(user, domain, error);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#removeErrorMapping(java.lang.String,
java.lang.String, java.lang.String)
+ *
+ * @see
+ *
org.apache.james.vut.api.VirtualUserTableManagementMBean#removeErrorMapping
+ * (java.lang.String, java.lang.String, java.lang.String)
*/
- public void removeErrorMapping(String user, String domain, String error)
throws VirtualUserTableException {
- vut.removeErrorMapping(user, domain, error);
+ public void removeErrorMapping(String user, String domain, String error)
throws Exception {
+ try {
+
+ vut.removeErrorMapping(user, domain, error);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#getUserDomainMappings(java.lang.String,
java.lang.String)
+ *
+ * @see org.apache.james.vut.api.VirtualUserTableManagementMBean#
+ * getUserDomainMappings(java.lang.String, java.lang.String)
*/
- public Collection<String> getUserDomainMappings(String user, String
domain) throws VirtualUserTableException {
- return vut.getUserDomainMappings(user, domain);
+ public Collection<String> getUserDomainMappings(String user, String
domain) throws Exception {
+ try {
+
+ return vut.getUserDomainMappings(user, domain);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#addMapping(java.lang.String,
java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.vut.api.VirtualUserTableManagementMBean#addMapping(java
+ * .lang.String, java.lang.String, java.lang.String)
*/
- public void addMapping(String user, String domain, String mapping) throws
VirtualUserTableException {
- vut.addMapping(user, domain, mapping);
+ public void addMapping(String user, String domain, String mapping) throws
Exception {
+ try {
+
+ vut.addMapping(user, domain, mapping);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#removeMapping(java.lang.String,
java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.vut.api.VirtualUserTableManagementMBean#removeMapping
+ * (java.lang.String, java.lang.String, java.lang.String)
*/
- public void removeMapping(String user, String domain, String mapping)
throws VirtualUserTableException {
- vut.removeMapping(user, domain, mapping);
+ public void removeMapping(String user, String domain, String mapping)
throws Exception {
+ try {
+
+ vut.removeMapping(user, domain, mapping);
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
/*
* (non-Javadoc)
- * @see
org.apache.james.vut.api.VirtualUserTableManagementMBean#getAllMappings()
+ *
+ * @see
+ *
org.apache.james.vut.api.VirtualUserTableManagementMBean#getAllMappings()
*/
- public Map<String, Collection<String>> getAllMappings() throws
VirtualUserTableException {
- return vut.getAllMappings();
+ public Map<String, Collection<String>> getAllMappings() throws Exception {
+ try {
+
+ return vut.getAllMappings();
+ } catch (VirtualUserTableException e) {
+ throw new Exception(e.getMessage());
+ }
}
}
Modified:
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java?rev=1055838&r1=1055837&r2=1055838&view=diff
==============================================================================
---
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
(original)
+++
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UsersRepositoryManagementTest.java
Thu Jan 6 11:52:16 2011
@@ -26,7 +26,6 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.UsersRepositoryManagement;
import org.apache.james.user.lib.mock.MockUsersRepository;
@@ -47,7 +46,7 @@ public class UsersRepositoryManagementTe
- public void testUserCount() throws UsersRepositoryException {
+ public void testUserCount() throws Exception {
assertEquals("no user yet", 0, m_userManagement.countUsers());
m_mockUsersRepository.addUser("testCount1", "testCount");
assertEquals("1 user", 1, m_userManagement.countUsers());
@@ -59,7 +58,7 @@ public class UsersRepositoryManagementTe
- public void testAddUserAndVerify() throws UsersRepositoryException {
+ public void testAddUserAndVerify() throws Exception {
m_mockUsersRepository.addUser("testCount1", "testCount");
assertFalse("user not there",
m_userManagement.verifyExists("testNotAdded"));
assertTrue("user is there",
m_userManagement.verifyExists("testCount1"));
@@ -67,7 +66,7 @@ public class UsersRepositoryManagementTe
assertFalse("user not there",
m_userManagement.verifyExists("testCount1"));
}
- public void testDelUser() throws UsersRepositoryException {
+ public void testDelUser() throws Exception {
m_mockUsersRepository.addUser("testDel", "test");
assertFalse("user not there",
m_userManagement.verifyExists("testNotDeletable"));
assertTrue("user is there", m_userManagement.verifyExists("testDel"));
@@ -75,7 +74,7 @@ public class UsersRepositoryManagementTe
assertFalse("user no longer there",
m_userManagement.verifyExists("testDel"));
}
- public void testListUsers() throws UsersRepositoryException {
+ public void testListUsers() throws Exception {
String[] usersArray = new String[] {"ccc", "aaa", "dddd", "bbbbb"};
List<String> users = Arrays.asList(usersArray);
@@ -95,7 +94,7 @@ public class UsersRepositoryManagementTe
}
- public void testSetPassword() throws UsersRepositoryException {
+ public void testSetPassword() throws Exception {
m_userManagement.addUser("testPwdUser", "pwd1");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
