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 er...@apache.org on 2010/10/21 11:11:07 UTC
svn commit: r1025895 - in /james/server/trunk:
user-api/src/main/java/org/apache/james/impl/
user-api/src/main/java/org/apache/james/impl/jamesuser/
user-api/src/main/java/org/apache/james/user/api/
user-api/src/main/java/org/apache/james/user/api/mana...
Author: eric
Date: Thu Oct 21 09:11:06 2010
New Revision: 1025895
URL: http://svn.apache.org/viewvc?rev=1025895&view=rev
Log:
Move MBean to api package + move JamesUserRepository interface from library to api (JAMES-1074)
Added:
james/server/trunk/user-api/src/main/java/org/apache/james/impl/
james/server/trunk/user-api/src/main/java/org/apache/james/impl/jamesuser/
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java
- copied, changed from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementException.java
- copied, changed from r1025892, james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java
- copied, changed from r1025892, james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java
- copied, changed from r1025892, james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java
Removed:
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/
james/server/trunk/user-api/src/test/
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java
Modified:
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java
james/server/trunk/user-library/src/test/java/org/apache/james/management/UserManagementTest.java
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java (from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java&r1=1025889&r2=1025895&rev=1025895&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/JamesUsersRepository.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java Thu Oct 21 09:11:06 2010
@@ -17,9 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.impl.jamesuser;
+package org.apache.james.user.api;
-import org.apache.james.user.api.UsersRepository;
import org.apache.james.vut.api.VirtualUserTable;
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementException.java (from r1025892, james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementException.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementException.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java&r1=1025892&r2=1025895&rev=1025895&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementException.java Thu Oct 21 09:11:06 2010
@@ -20,7 +20,7 @@
-package org.apache.james.user.api.management;
+package org.apache.james.user.api;
public class UserManagementException extends Exception {
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java (from r1025892, james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java&r1=1025892&r2=1025895&rev=1025895&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UserManagementMBean.java Thu Oct 21 09:11:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.user.api.management;
+package org.apache.james.user.api;
import java.util.List;
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java (from r1025892, james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java&r1=1025892&r2=1025895&rev=1025895&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTableManagementMBean.java Thu Oct 21 09:11:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.vut.api.management;
+package org.apache.james.vut.api;
import java.util.Collection;
import java.util.Map;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java?rev=1025895&r1=1025894&r2=1025895&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java Thu Oct 21 09:11:06 2010
@@ -28,6 +28,7 @@ import org.apache.james.impl.user.Defaul
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.user.api.JamesUser;
+import org.apache.james.user.api.JamesUsersRepository;
import org.apache.james.user.api.User;
import org.apache.james.vut.api.ErrorMappingException;
@@ -209,21 +210,21 @@ public abstract class AbstractUsersRepos
/**
- * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableAliases(boolean)
+ * @see org.apache.james.user.api.JamesUsersRepository#setEnableAliases(boolean)
*/
public void setEnableAliases(boolean enableAliases) {
this.enableAliases = enableAliases;
}
/**
- * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableForwarding(boolean)
+ * @see org.apache.james.user.api.JamesUsersRepository#setEnableForwarding(boolean)
*/
public void setEnableForwarding(boolean enableForwarding) {
this.enableForwarding = enableForwarding;
}
/**
- * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setIgnoreCase(boolean)
+ * @see org.apache.james.user.api.JamesUsersRepository#setIgnoreCase(boolean)
*/
public void setIgnoreCase(boolean ignoreCase) {
this.ignoreCase = ignoreCase;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java?rev=1025895&r1=1025894&r2=1025895&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java Thu Oct 21 09:11:06 2010
@@ -20,6 +20,7 @@
package org.apache.james.impl.jamesuser;
import org.apache.james.impl.user.LocalUsersRepository;
+import org.apache.james.user.api.JamesUsersRepository;
import org.apache.james.vut.api.ErrorMappingException;
import java.util.Collection;
@@ -35,7 +36,7 @@ public class LocalJamesUsersRepository e
/**
- * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableAliases(boolean)
+ * @see org.apache.james.user.api.JamesUsersRepository#setEnableAliases(boolean)
*/
public void setEnableAliases(boolean enableAliases) {
if (users instanceof JamesUsersRepository) {
@@ -46,7 +47,7 @@ public class LocalJamesUsersRepository e
}
/**
- * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setEnableForwarding(boolean)
+ * @see org.apache.james.user.api.JamesUsersRepository#setEnableForwarding(boolean)
*/
public void setEnableForwarding(boolean enableForwarding) {
if (users instanceof JamesUsersRepository) {
@@ -57,7 +58,7 @@ public class LocalJamesUsersRepository e
}
/**
- * @see org.apache.james.impl.jamesuser.JamesUsersRepository#setIgnoreCase(boolean)
+ * @see org.apache.james.user.api.JamesUsersRepository#setIgnoreCase(boolean)
*/
public void setIgnoreCase(boolean ignoreCase) {
if (users instanceof JamesUsersRepository) {
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java?rev=1025895&r1=1025894&r2=1025895&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java Thu Oct 21 09:11:06 2010
@@ -30,10 +30,10 @@ import javax.annotation.Resource;
import org.apache.james.user.api.JamesUser;
import org.apache.james.user.api.User;
+import org.apache.james.user.api.UserManagementException;
+import org.apache.james.user.api.UserManagementMBean;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersStore;
-import org.apache.james.user.api.management.UserManagementException;
-import org.apache.james.user.api.management.UserManagementMBean;
public class UserManagement implements UserManagementMBean {
@@ -75,14 +75,14 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#addUser(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#addUser(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean addUser(String userName, String password, String repositoryName) throws UserManagementException {
return getUserRepository(repositoryName).addUser(userName, password);
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#deleteUser(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#deleteUser(java.lang.String, java.lang.String)
*/
public boolean deleteUser(String userName, String repositoryName) throws UserManagementException {
UsersRepository users = getUserRepository(repositoryName);
@@ -92,7 +92,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#verifyExists(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#verifyExists(java.lang.String, java.lang.String)
*/
public boolean verifyExists(String userName, String repositoryName) throws UserManagementException {
UsersRepository users = getUserRepository(repositoryName);
@@ -100,7 +100,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#countUsers(java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#countUsers(java.lang.String)
*/
public long countUsers(String repositoryName) throws UserManagementException {
UsersRepository users = getUserRepository(repositoryName);
@@ -108,7 +108,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#listAllUsers(java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#listAllUsers(java.lang.String)
*/
public String[] listAllUsers(String repositoryName) throws UserManagementException {
List<String> userNames = new ArrayList<String>();
@@ -120,7 +120,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#setPassword(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#setPassword(java.lang.String, java.lang.String, java.lang.String)
*/
public boolean setPassword(String userName, String password, String repositoryName) throws UserManagementException {
UsersRepository users = getUserRepository(repositoryName);
@@ -130,7 +130,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#unsetAlias(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#unsetAlias(java.lang.String, java.lang.String)
*/
public boolean unsetAlias(String userName, String repositoryName) throws UserManagementException {
JamesUser user = getJamesUser(userName, null);
@@ -142,7 +142,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#getAlias(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#getAlias(java.lang.String, java.lang.String)
*/
public String getAlias(String userName, String repositoryName) throws UserManagementException {
JamesUser user = getJamesUser(userName, null);
@@ -151,7 +151,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#unsetForwardAddress(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#unsetForwardAddress(java.lang.String, java.lang.String)
*/
public boolean unsetForwardAddress(String userName, String repositoryName) throws UserManagementException {
JamesUser user = getJamesUser(userName, null);
@@ -164,7 +164,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#getForwardAddress(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UserManagementMBean#getForwardAddress(java.lang.String, java.lang.String)
*/
public String getForwardAddress(String userName, String repositoryName) throws UserManagementException {
JamesUser user = getJamesUser(userName, null);
@@ -173,7 +173,7 @@ public class UserManagement implements U
}
/**
- * @see org.apache.james.user.api.management.UserManagementMBean#getUserRepositoryNames()
+ * @see org.apache.james.user.api.UserManagementMBean#getUserRepositoryNames()
*/
public List<String> getUserRepositoryNames() {
List<String> result = new ArrayList<String>();
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java?rev=1025895&r1=1025894&r2=1025895&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java Thu Oct 21 09:11:06 2010
@@ -28,7 +28,7 @@ import java.util.Map;
import javax.annotation.Resource;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
-import org.apache.james.vut.api.management.VirtualUserTableManagementMBean;
+import org.apache.james.vut.api.VirtualUserTableManagementMBean;
/**
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/management/UserManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/management/UserManagementTest.java?rev=1025895&r1=1025894&r2=1025895&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/management/UserManagementTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/management/UserManagementTest.java Thu Oct 21 09:11:06 2010
@@ -27,7 +27,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.apache.james.impl.user.UserManagement;
-import org.apache.james.user.api.management.UserManagementException;
+import org.apache.james.user.api.UserManagementException;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.usersstore.MockUsersStore;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org