Author: norman
Date: Thu Dec 30 19:03:12 2010
New Revision: 1053978
URL: http://svn.apache.org/viewvc?rev=1053978&view=rev
Log:
Rename UserManagement* to UsersRepositoryManagement* to be more inline with the
rest
Added:
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
- copied, changed from r1052807,
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
- copied, changed from r1052807,
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java
Removed:
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml?rev=1053978&r1=1053977&r2=1053978&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
Thu Dec 30 19:03:12 2010
@@ -385,7 +385,7 @@
<entry key="org.apache.james:type=component,name=domainlist"
value-ref="domainlistmanagement"/>
<entry key="org.apache.james:type=component,name=dnsservice"
value-ref="dnsservice"/>
<entry key="org.apache.james:type=component,name=virtualusertable"
value-ref="virtualusertablemanagement"/>
- <entry key="org.apache.james:type=component,name=usermanagement"
value-ref="usermanagement"/>
+ <entry key="org.apache.james:type=component,name=usersrepository"
value-ref="usersrepositorymanagement"/>
<entry key="org.apache.james:type=component,name=fetchmail"
value-ref="fetchmail"/>
<entry key="org.apache.james:type=component,name=mailboxmanagement"
value-ref="mailboxmanagermanagement"/>
<entry key="org.apache.james:type=component,name=mailspooler"
value-ref="mailspooler"/>
@@ -394,11 +394,11 @@
</property>
<property name="assembler">
<bean
class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- <property name="managedInterfaces"
value="org.apache.james.smtpserver.netty.SMTPServerMBean,org.apache.james.pop3server.netty.POP3ServerMBean,org.apache.james.imapserver.netty.IMAPServerMBean,org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean,org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean,org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean"/>
+ <property name="managedInterfaces"
value="org.apache.james.smtpserver.netty.SMTPServerMBean,org.apache.james.pop3server.netty.POP3ServerMBean,org.apache.james.imapserver.netty.IMAPServerMBean,org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UsersRepositoryManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean,org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean,org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean"/>
</bean>
</property>
</bean>
- <bean id="usermanagement" class="org.apache.james.user.lib.UserManagement"
/>
+ <bean id="usersrepositorymanagement"
class="org.apache.james.user.lib.UsersRepositoryManagement" />
<bean id="virtualusertablemanagement"
class="org.apache.james.vut.lib.VirtualUserTableManagement" />
<bean id="domainlistmanagement"
class="org.apache.james.domainlist.lib.DomainListManagement" />
<bean id="mailboxmanagermanagement"
class="org.apache.james.adapter.mailbox.MailboxManagerManagement" />
Copied:
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
(from r1052807,
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java&r1=1052807&r2=1053978&rev=1053978&view=diff
==============================================================================
---
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java
(original)
+++
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryManagementMBean.java
Thu Dec 30 19:03:12 2010
@@ -21,13 +21,12 @@
package org.apache.james.user.api;
-import java.util.List;
/**
* Expose user account management functionality through JMX.
*
*/
-public interface UserManagementMBean {
+public interface UsersRepositoryManagementMBean {
/**
* Adds a user to this mail server.
Copied:
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
(from r1052807,
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java&r1=1052807&r2=1053978&rev=1053978&view=diff
==============================================================================
---
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java
(original)
+++
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
Thu Dec 30 19:03:12 2010
@@ -30,12 +30,12 @@ import javax.annotation.Resource;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
-import org.apache.james.user.api.UserManagementMBean;
+import org.apache.james.user.api.UsersRepositoryManagementMBean;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.model.JamesUser;
import org.apache.james.user.api.model.User;
-public class UserManagement extends StandardMBean implements
UserManagementMBean {
+public class UsersRepositoryManagement extends StandardMBean implements
UsersRepositoryManagementMBean {
/**
* The administered UsersRepository
@@ -48,8 +48,8 @@ public class UserManagement extends Stan
}
- public UserManagement() throws NotCompliantMBeanException {
- super(UserManagementMBean.class);
+ public UsersRepositoryManagement() throws NotCompliantMBeanException {
+ super(UsersRepositoryManagementMBean.class);
}
@@ -64,7 +64,7 @@ public class UserManagement extends Stan
/*
* (non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#addUser(java.lang.String,
java.lang.String)
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#addUser(java.lang.String,
java.lang.String)
*/
public boolean addUser(String userName, String password) {
return localUsers.addUser(userName, password);
@@ -72,7 +72,7 @@ public class UserManagement extends Stan
/*
* (non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#deleteUser(java.lang.String)
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#deleteUser(java.lang.String)
*/
public boolean deleteUser(String userName) {
if (!localUsers.contains(userName)) return false;
@@ -80,9 +80,10 @@ public class UserManagement extends Stan
return true;
}
+
/*
- * /(non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#verifyExists(java.lang.String)
+ * (non-Javadoc)
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#verifyExists(java.lang.String)
*/
public boolean verifyExists(String userName) {
return localUsers.contains(userName);
@@ -91,16 +92,17 @@ public class UserManagement extends Stan
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UserManagementMBean#countUsers()
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#countUsers()
*/
public long countUsers() {
return localUsers.countUsers();
}
+
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UserManagementMBean#listAllUsers()
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#listAllUsers()
*/
public String[] listAllUsers() {
List<String> userNames = new ArrayList<String>();
@@ -110,9 +112,11 @@ public class UserManagement extends Stan
return (String[])userNames.toArray(new String[]{});
}
+
+
/*
* (non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#setPassword(java.lang.String,
java.lang.String)
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#setPassword(java.lang.String,
java.lang.String)
*/
public boolean setPassword(String userName, String password) {
User user = localUsers.getUserByName(userName);
@@ -122,9 +126,8 @@ public class UserManagement extends Stan
/*
- *
* (non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#unsetAlias(java.lang.String)
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#unsetAlias(java.lang.String)
*/
public boolean unsetAlias(String userName) {
JamesUser user = getJamesUser(userName);
@@ -138,7 +141,7 @@ public class UserManagement extends Stan
/*
* (non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#getAlias(java.lang.String)
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#getAlias(java.lang.String)
*/
public String getAlias(String userName) {
JamesUser user = getJamesUser(userName);
@@ -146,9 +149,10 @@ public class UserManagement extends Stan
return user.getAlias();
}
+
/*
* (non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#unsetForwardAddress(java.lang.String)
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#unsetForwardAddress(java.lang.String)
*/
public boolean unsetForwardAddress(String userName) {
JamesUser user = getJamesUser(userName);
@@ -163,7 +167,7 @@ public class UserManagement extends Stan
/*
* (non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#getForwardAddress(java.lang.String)
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#getForwardAddress(java.lang.String)
*/
public String getForwardAddress(String userName) {
JamesUser user = getJamesUser(userName);
@@ -173,7 +177,7 @@ public class UserManagement extends Stan
/*
* (non-Javadoc)
- * @see
org.apache.james.user.api.UserManagementMBean#getVirtualHostingEnabled()
+ * @see
org.apache.james.user.api.UsersRepositoryManagementMBean#getVirtualHostingEnabled()
*/
public boolean getVirtualHostingEnabled() {
return localUsers.supportVirtualHosting();
Modified:
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java?rev=1053978&r1=1053977&r2=1053978&view=diff
==============================================================================
---
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
(original)
+++
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
Thu Dec 30 19:03:12 2010
@@ -26,7 +26,7 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.james.user.lib.UserManagement;
+import org.apache.james.user.lib.UsersRepositoryManagement;
import org.apache.james.user.lib.mock.MockUsersRepository;
/**
@@ -35,12 +35,12 @@ import org.apache.james.user.lib.mock.Mo
public class UserManagementTest extends TestCase {
private MockUsersRepository m_mockUsersRepository;
- private UserManagement m_userManagement;
+ private UsersRepositoryManagement m_userManagement;
protected void setUp() throws Exception {
m_mockUsersRepository = new MockUsersRepository();
- m_userManagement = new UserManagement();
+ m_userManagement = new UsersRepositoryManagement();
m_userManagement.setUsersRepository(m_mockUsersRepository);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
