Author: eric Date: Fri Feb 8 12:39:03 2013 New Revision: 1443988 URL: http://svn.apache.org/r1443988 Log: Fix injection for JMX (JAMES-1477)
Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java?rev=1443988&r1=1443987&r2=1443988&view=diff ============================================================================== --- james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java (original) +++ james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java Fri Feb 8 12:39:03 2013 @@ -18,7 +18,9 @@ ****************************************************************/ package org.apache.james.domainlist.lib; +import javax.annotation.Resource; import javax.inject.Inject; +import javax.inject.Named; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; @@ -34,8 +36,9 @@ public class DomainListManagement extend super(DomainListManagementMBean.class); } - @Inject - public void setDomainList(DomainList domainList) { + @Inject + @Resource(name = "domainlist") + public void setDomainList(@Named("domainlist") DomainList domainList) { this.domainList = domainList; } @@ -49,7 +52,6 @@ public class DomainListManagement extend public boolean containsDomain(String domain) throws Exception { try { - return domainList.containsDomain(domain); } catch (DomainListException e) { throw new Exception(e.getMessage()); @@ -58,7 +60,6 @@ public class DomainListManagement extend public String[] getDomains() throws Exception { try { - return domainList.getDomains(); } catch (DomainListException e) { throw new Exception(e.getMessage()); @@ -67,7 +68,6 @@ public class DomainListManagement extend public void removeDomain(String domain) throws Exception { try { - domainList.removeDomain(domain); } catch (DomainListException e) { throw new Exception(e.getMessage()); @@ -76,11 +76,11 @@ public class DomainListManagement extend public String getDefaultDomain() throws Exception { try { - return domainList.getDefaultDomain(); } catch (DomainListException e) { throw new Exception(e.getMessage()); } + } } Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java?rev=1443988&r1=1443987&r2=1443988&view=diff ============================================================================== --- james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java (original) +++ james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java Fri Feb 8 12:39:03 2013 @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - package org.apache.james.rrt.lib; import java.util.Collection; import java.util.Map; +import javax.annotation.Resource; import javax.inject.Inject; +import javax.inject.Named; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; @@ -35,15 +36,16 @@ import org.apache.james.rrt.api.Recipien */ public class RecipientRewriteTableManagement extends StandardMBean implements RecipientRewriteTableManagementMBean { + private RecipientRewriteTable rrt; + protected RecipientRewriteTableManagement() throws NotCompliantMBeanException { super(RecipientRewriteTableManagementMBean.class); } - private RecipientRewriteTable vut; - @Inject - public void setManageableRecipientRewriteTable(RecipientRewriteTable vut) { - this.vut = vut; + @Resource(name = "recipientrewritetable") + public void setManageableRecipientRewriteTable(@Named("recipientrewritetable") RecipientRewriteTable rrt) { + this.rrt = rrt; } /** @@ -53,7 +55,7 @@ public class RecipientRewriteTableManage */ public void addRegexMapping(String user, String domain, String regex) throws Exception { try { - vut.addRegexMapping(user, domain, regex); + rrt.addRegexMapping(user, domain, regex); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -66,8 +68,7 @@ public class RecipientRewriteTableManage */ public void removeRegexMapping(String user, String domain, String regex) throws Exception { try { - - vut.removeRegexMapping(user, domain, regex); + rrt.removeRegexMapping(user, domain, regex); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -80,8 +81,7 @@ public class RecipientRewriteTableManage */ public void addAddressMapping(String user, String domain, String address) throws Exception { try { - - vut.addAddressMapping(user, domain, address); + rrt.addAddressMapping(user, domain, address); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -94,8 +94,7 @@ public class RecipientRewriteTableManage */ public void removeAddressMapping(String user, String domain, String address) throws Exception { try { - - vut.removeAddressMapping(user, domain, address); + rrt.removeAddressMapping(user, domain, address); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -108,8 +107,7 @@ public class RecipientRewriteTableManage */ public void addErrorMapping(String user, String domain, String error) throws Exception { try { - - vut.addErrorMapping(user, domain, error); + rrt.addErrorMapping(user, domain, error); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -122,8 +120,7 @@ public class RecipientRewriteTableManage */ public void removeErrorMapping(String user, String domain, String error) throws Exception { try { - - vut.removeErrorMapping(user, domain, error); + rrt.removeErrorMapping(user, domain, error); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -131,7 +128,7 @@ public class RecipientRewriteTableManage public void addDomainMapping(String domain, String targetDomain) throws Exception { try { - vut.addAliasDomainMapping(domain, targetDomain); + rrt.addAliasDomainMapping(domain, targetDomain); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -139,7 +136,7 @@ public class RecipientRewriteTableManage public void removeDomainMapping(String domain, String targetDomain) throws Exception { try { - vut.removeAliasDomainMapping(domain, targetDomain); + rrt.removeAliasDomainMapping(domain, targetDomain); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -151,8 +148,7 @@ public class RecipientRewriteTableManage */ public Collection<String> getUserDomainMappings(String user, String domain) throws Exception { try { - - return vut.getUserDomainMappings(user, domain); + return rrt.getUserDomainMappings(user, domain); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -165,8 +161,7 @@ public class RecipientRewriteTableManage */ public void addMapping(String user, String domain, String mapping) throws Exception { try { - - vut.addMapping(user, domain, mapping); + rrt.addMapping(user, domain, mapping); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -179,8 +174,7 @@ public class RecipientRewriteTableManage */ public void removeMapping(String user, String domain, String mapping) throws Exception { try { - - vut.removeMapping(user, domain, mapping); + rrt.removeMapping(user, domain, mapping); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } @@ -192,8 +186,7 @@ public class RecipientRewriteTableManage */ public Map<String, Collection<String>> getAllMappings() throws Exception { try { - - return vut.getAllMappings(); + return rrt.getAllMappings(); } catch (RecipientRewriteTableException e) { throw new Exception(e.getMessage()); } Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java?rev=1443988&r1=1443987&r2=1443988&view=diff ============================================================================== --- james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java (original) +++ james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java Fri Feb 8 12:39:03 2013 @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - package org.apache.james.user.lib; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.annotation.Resource; import javax.inject.Inject; +import javax.inject.Named; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; @@ -38,11 +39,12 @@ public class UsersRepositoryManagement e /** * The administered UsersRepository */ - private UsersRepository localUsers; + private UsersRepository usersRepository; @Inject - public void setUsersRepository(UsersRepository localUsers) { - this.localUsers = localUsers; + @Resource(name = "usersrepository") + public void setUsersRepository(@Named("usersrepository") UsersRepository usersRepository) { + this.usersRepository = usersRepository; } public UsersRepositoryManagement() throws NotCompliantMBeanException { @@ -50,7 +52,7 @@ public class UsersRepositoryManagement e } private JamesUser getJamesUser(String userName) throws UsersRepositoryException { - User baseuser = localUsers.getUserByName(userName); + User baseuser = usersRepository.getUserByName(userName); if (baseuser == null) throw new IllegalArgumentException("user not found: " + userName); if (!(baseuser instanceof JamesUser)) @@ -65,7 +67,7 @@ public class UsersRepositoryManagement e */ public void addUser(String userName, String password) throws Exception { try { - localUsers.addUser(userName, password); + usersRepository.addUser(userName, password); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); } @@ -77,7 +79,7 @@ public class UsersRepositoryManagement e */ public void deleteUser(String userName) throws Exception { try { - localUsers.removeUser(userName); + usersRepository.removeUser(userName); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); } @@ -90,7 +92,7 @@ public class UsersRepositoryManagement e */ public boolean verifyExists(String userName) throws Exception { try { - return localUsers.contains(userName); + return usersRepository.contains(userName); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); } @@ -102,7 +104,7 @@ public class UsersRepositoryManagement e */ public long countUsers() throws Exception { try { - return localUsers.countUsers(); + return usersRepository.countUsers(); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); } @@ -115,7 +117,7 @@ public class UsersRepositoryManagement e public String[] listAllUsers() throws Exception { List<String> userNames = new ArrayList<String>(); try { - for (Iterator<String> it = localUsers.list(); it.hasNext();) { + for (Iterator<String> it = usersRepository.list(); it.hasNext();) { userNames.add(it.next()); } } catch (UsersRepositoryException e) { @@ -132,13 +134,13 @@ public class UsersRepositoryManagement e */ public void setPassword(String userName, String password) throws Exception { try { - User user = localUsers.getUserByName(userName); + User user = usersRepository.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); + usersRepository.updateUser(user); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); @@ -153,16 +155,14 @@ public class UsersRepositoryManagement e public void unsetAlias(String userName) throws Exception { try { JamesUser user = getJamesUser(userName); - if (!user.getAliasing()) + if (!user.getAliasing()) { throw new UsersRepositoryException("User " + user + " is no alias"); - + } user.setAliasing(false); - localUsers.updateUser(user); + usersRepository.updateUser(user); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); - } - } /** @@ -172,14 +172,14 @@ public class UsersRepositoryManagement e public String getAlias(String userName) throws Exception { try { JamesUser user = getJamesUser(userName); - if (!user.getAliasing()) + if (!user.getAliasing()) { return null; + } return user.getAlias(); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); } - } /** @@ -190,16 +190,14 @@ public class UsersRepositoryManagement e public void unsetForwardAddress(String userName) throws Exception { try { JamesUser user = getJamesUser(userName); - if (!user.getForwarding()) + if (!user.getForwarding()) { throw new UsersRepositoryException("User " + user + " is no forward"); - + } user.setForwarding(false); - localUsers.updateUser(user); + usersRepository.updateUser(user); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); - } - } /** @@ -210,14 +208,13 @@ public class UsersRepositoryManagement e public String getForwardAddress(String userName) throws Exception { try { JamesUser user = getJamesUser(userName); - if (!user.getForwarding()) + if (!user.getForwarding()) { return null; + } return user.getForwardingDestination().toString(); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); - } - } /** @@ -225,10 +222,9 @@ public class UsersRepositoryManagement e */ public boolean getVirtualHostingEnabled() throws Exception { try { - return localUsers.supportVirtualHosting(); + return usersRepository.supportVirtualHosting(); } catch (UsersRepositoryException e) { throw new Exception(e.getMessage()); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org