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:20:33 UTC
svn commit: r1025898 - in /james/server/trunk:
mailets/src/main/java/org/apache/james/transport/mailets/
user-file/src/main/java/org/apache/james/userrepository/
user-file/src/main/java/org/apache/james/vut/
user-file/src/test/java/org/apache/james/vut...
Author: eric
Date: Thu Oct 21 09:20:31 2010
New Revision: 1025898
URL: http://svn.apache.org/viewvc?rev=1025898&view=rev
Log:
Align packages hierarchy for user service - lib part (JAMES1074)
Added:
james/server/trunk/user-library/src/main/java/org/apache/james/user/
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractStore.java
- copied, changed from r1025884, james/server/trunk/user-library/src/main/java/org/apache/james/impl/AbstractStore.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
- copied, changed from r1025895, 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/user/lib/DefaultJamesUser.java
- copied, changed from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java
- copied, changed from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DigestUtil.java
- copied, changed from r1025884, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersStore.java
- copied, changed from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/JamesUsersStore.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/LocalJamesUsersRepository.java
- copied, changed from r1025895, 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/user/lib/LocalUsersRepository.java
- copied, changed from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java
- copied, changed from r1025895, 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/user/lib/package.html
- copied unchanged from r1025884, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/package.html
james/server/trunk/user-library/src/main/java/org/apache/james/vut/
james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/
- copied from r1025884, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/
james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java
- copied, changed from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java
- copied, changed from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/JamesVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java
- copied, changed from r1025895, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java
- copied, changed from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java
Removed:
james/server/trunk/user-library/src/main/java/org/apache/james/impl/AbstractStore.java
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/DefaultJamesUser.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/JamesUsersStore.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.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/user/package.html
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java
james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
james/server/trunk/user-file/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
james/server/trunk/user-file/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java
james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
james/server/trunk/user-library/src/test/java/org/apache/james/management/MockVirtualUserTableManagementImpl.java
james/server/trunk/user-library/src/test/java/org/apache/james/management/UserManagementTest.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractVirtualUserTable.java Thu Oct 21 09:20:31 2010
@@ -36,8 +36,8 @@ import javax.mail.internet.ParseExceptio
import org.apache.james.core.MailImpl;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.services.MailServer;
+import org.apache.james.vut.lib.VirtualUserTableUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.base.GenericMailet;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java Thu Oct 21 09:20:31 2010
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets;
-import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.vut.lib.VirtualUserTableUtil;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLVirtualUserTable.java Thu Oct 21 09:20:31 2010
@@ -28,7 +28,7 @@ import java.util.Map;
import javax.mail.MessagingException;
-import org.apache.james.impl.vut.VirtualUserTableUtil;
+import org.apache.james.vut.lib.VirtualUserTableUtil;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java (original)
+++ james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java Thu Oct 21 09:20:31 2010
@@ -24,11 +24,11 @@ package org.apache.james.userrepository;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.impl.jamesuser.AbstractUsersRepository;
-import org.apache.james.impl.user.DefaultJamesUser;
import org.apache.james.mailstore.api.MailStore;
import org.apache.james.repository.ObjectRepository;
import org.apache.james.user.api.User;
+import org.apache.james.user.lib.AbstractUsersRepository;
+import org.apache.james.user.lib.DefaultJamesUser;
import java.util.Iterator;
@@ -78,7 +78,7 @@ public class UsersFileRepository
/**
- * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
+ * @see org.apache.james.user.lib.AbstractUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
protected void doConfigure( final HierarchicalConfiguration configuration )
throws ConfigurationException {
@@ -128,7 +128,7 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doAddUser(org.apache.james.user.api.User)
+ * @see org.apache.james.user.lib.AbstractUsersRepository#doAddUser(org.apache.james.user.api.User)
*/
protected void doAddUser(User user) {
try {
@@ -206,7 +206,7 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doUpdateUser(org.apache.james.user.api.User)
+ * @see org.apache.james.user.lib.AbstractUsersRepository#doUpdateUser(org.apache.james.user.api.User)
*/
public void doUpdateUser(User user) {
try {
Modified: james/server/trunk/user-file/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-file/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java (original)
+++ james/server/trunk/user-file/src/main/java/org/apache/james/vut/XMLVirtualUserTable.java Thu Oct 21 09:20:31 2010
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.impl.vut.AbstractVirtualUserTable;
-import org.apache.james.impl.vut.VirtualUserTableUtil;
+import org.apache.james.vut.lib.AbstractVirtualUserTable;
+import org.apache.james.vut.lib.VirtualUserTableUtil;
/**
* Class responsible to implement the Virtual User Table in XML disk file.
@@ -40,7 +40,7 @@ public class XMLVirtualUserTable extends
private Map<String,String> mappings;
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
@SuppressWarnings("unchecked")
protected void doConfigure(HierarchicalConfiguration arg0) throws ConfigurationException {
@@ -68,7 +68,7 @@ public class XMLVirtualUserTable extends
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
*/
protected String mapAddressInternal(String user, String domain) {
if (mappings == null) {
@@ -87,7 +87,7 @@ public class XMLVirtualUserTable extends
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getUserDomainMappingsInternal(java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#getUserDomainMappingsInternal(java.lang.String, java.lang.String)
*/
protected Collection<String> getUserDomainMappingsInternal(String user, String domain) {
if (mappings == null) {
@@ -103,7 +103,7 @@ public class XMLVirtualUserTable extends
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getAllMappingsInternal()
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#getAllMappingsInternal()
*/
protected Map<String,Collection<String>> getAllMappingsInternal() {
if ( mappings != null && mappings.size() > 0) {
Modified: james/server/trunk/user-file/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-file/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java (original)
+++ james/server/trunk/user-file/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java Thu Oct 21 09:20:31 2010
@@ -24,10 +24,10 @@ import java.util.List;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.impl.vut.AbstractVirtualUserTable;
-import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
import org.apache.james.vut.api.VirtualUserTable;
+import org.apache.james.vut.lib.AbstractVirtualUserTable;
+import org.apache.james.vut.lib.VirtualUserTableUtil;
/**
* Test the XML Virtual User Table implementation.
Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Thu Oct 21 09:20:31 2010
@@ -21,9 +21,9 @@ package org.apache.james.userrepository;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.impl.jamesuser.AbstractUsersRepository;
import org.apache.james.services.FileSystem;
import org.apache.james.user.api.User;
+import org.apache.james.user.lib.AbstractUsersRepository;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
@@ -379,7 +379,7 @@ public abstract class AbstractJdbcUsersR
* </repository>
* </pre>
*
- * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
+ * @see org.apache.james.user.lib.AbstractUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
@SuppressWarnings("unchecked")
protected void doConfigure(HierarchicalConfiguration configuration)
Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java (original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java Thu Oct 21 09:20:31 2010
@@ -21,8 +21,8 @@
package org.apache.james.userrepository;
-import org.apache.james.impl.user.DefaultUser;
import org.apache.james.user.api.User;
+import org.apache.james.user.lib.DefaultUser;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java (original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java Thu Oct 21 09:20:31 2010
@@ -21,9 +21,9 @@
package org.apache.james.userrepository;
-import org.apache.james.impl.user.DefaultJamesUser;
-import org.apache.james.impl.user.DefaultUser;
import org.apache.james.user.api.User;
+import org.apache.james.user.lib.DefaultJamesUser;
+import org.apache.james.user.lib.DefaultUser;
import org.apache.mailet.MailAddress;
import java.sql.PreparedStatement;
Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java (original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java Thu Oct 21 09:20:31 2010
@@ -21,8 +21,8 @@
package org.apache.james.userrepository;
-import org.apache.james.impl.user.DefaultUser;
import org.apache.james.user.api.User;
+import org.apache.james.user.lib.DefaultUser;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -40,7 +40,7 @@ public class ListUsersJdbcRepository ext
/**
- * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#test(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.lib.AbstractUsersRepository#test(java.lang.String, java.lang.String)
*/
public boolean test(String name, String password) {
// list repository does not store passwords so we always return false!
Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Thu Oct 21 09:20:31 2010
@@ -36,12 +36,12 @@ import javax.sql.DataSource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.impl.vut.AbstractVirtualUserTable;
-import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.services.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
+import org.apache.james.vut.lib.AbstractVirtualUserTable;
+import org.apache.james.vut.lib.VirtualUserTableUtil;
/**
* Class responsible to implement the Virtual User Table in database with JDBC access.
@@ -219,7 +219,7 @@ public class JDBCVirtualUserTable extend
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#addMappingInternal(String, String, String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#addMappingInternal(String, String, String)
*/
protected boolean addMappingInternal(String user, String domain, String regex) throws ManageableVirtualUserTableException {
@@ -237,7 +237,7 @@ public class JDBCVirtualUserTable extend
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
*/
protected String mapAddressInternal(String user, String domain) {
Connection conn = null;
@@ -268,7 +268,7 @@ public class JDBCVirtualUserTable extend
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddress(java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#mapAddress(java.lang.String, java.lang.String)
*/
protected Collection<String> getUserDomainMappingsInternal(String user, String domain) {
Connection conn = null;
@@ -297,7 +297,7 @@ public class JDBCVirtualUserTable extend
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getAllMappingsInternal()
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#getAllMappingsInternal()
*/
protected Map<String,Collection<String>> getAllMappingsInternal() {
Connection conn = null;
@@ -330,7 +330,7 @@ public class JDBCVirtualUserTable extend
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#removeMappingInternal(String, String, String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#removeMappingInternal(String, String, String)
*/
protected boolean removeMappingInternal(String user, String domain, String mapping) throws ManageableVirtualUserTableException {
String newUser = getUserString(user);
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Thu Oct 21 09:20:31 2010
@@ -20,10 +20,10 @@ package org.apache.james.vut;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.services.MockFileSystem;
import org.apache.james.util.TestUtil;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
+import org.apache.james.vut.lib.AbstractVirtualUserTable;
/**
* Test the JDBC Virtual User Table implementation.
Modified: james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java (original)
+++ james/server/trunk/user-jpa/src/main/java/org/apache/james/vut/JPAVirtualUserTable.java Thu Oct 21 09:20:31 2010
@@ -29,9 +29,9 @@ import javax.persistence.EntityTransacti
import javax.persistence.PersistenceException;
import javax.persistence.PersistenceUnit;
-import org.apache.james.impl.vut.AbstractVirtualUserTable;
-import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
+import org.apache.james.vut.lib.AbstractVirtualUserTable;
+import org.apache.james.vut.lib.VirtualUserTableUtil;
import org.apache.james.vut.model.JPAVirtualUser;
/**
@@ -55,7 +55,7 @@ public class JPAVirtualUserTable extends
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#addMappingInternal(String, String, String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#addMappingInternal(String, String, String)
*/
protected boolean addMappingInternal(String user, String domain, String regex) throws ManageableVirtualUserTableException {
@@ -73,7 +73,7 @@ public class JPAVirtualUserTable extends
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#mapAddressInternal(java.lang.String, java.lang.String)
*/
protected String mapAddressInternal(String user, String domain) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
@@ -99,7 +99,7 @@ public class JPAVirtualUserTable extends
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#mapAddress(java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#mapAddress(java.lang.String, java.lang.String)
*/
protected Collection<String> getUserDomainMappingsInternal(String user, String domain) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
@@ -125,7 +125,7 @@ public class JPAVirtualUserTable extends
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#getAllMappingsInternal()
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#getAllMappingsInternal()
*/
protected Map<String,Collection<String>> getAllMappingsInternal() {
EntityManager entityManager = entityManagerFactory.createEntityManager();
@@ -151,7 +151,7 @@ public class JPAVirtualUserTable extends
}
/**
- * @see org.apache.james.impl.vut.AbstractVirtualUserTable#removeMappingInternal(String, String, String)
+ * @see org.apache.james.vut.lib.AbstractVirtualUserTable#removeMappingInternal(String, String, String)
*/
protected boolean removeMappingInternal(String user, String domain, String mapping) throws ManageableVirtualUserTableException {
String newUser = getUserString(user);
Modified: james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java (original)
+++ james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java Thu Oct 21 09:20:31 2010
@@ -22,8 +22,8 @@ import java.util.HashMap;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.vut.api.ManageableVirtualUserTableException;
+import org.apache.james.vut.lib.AbstractVirtualUserTable;
import org.apache.james.vut.model.JPAVirtualUser;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAPersistence;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractStore.java (from r1025884, james/server/trunk/user-library/src/main/java/org/apache/james/impl/AbstractStore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractStore.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractStore.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/AbstractStore.java&r1=1025884&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/AbstractStore.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractStore.java Thu Oct 21 09:20:31 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.impl;
+package org.apache.james.user.lib;
import java.util.Collections;
import java.util.HashMap;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java (from r1025895, 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/user/lib/AbstractUsersRepository.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java&r1=1025895&r2=1025898&rev=1025898&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/user/lib/AbstractUsersRepository.java Thu Oct 21 09:20:31 2010
@@ -19,12 +19,11 @@
-package org.apache.james.impl.jamesuser;
+package org.apache.james.user.lib;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.impl.user.DefaultUser;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.user.api.JamesUser;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java (from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java&r1=1025889&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultJamesUser.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java Thu Oct 21 09:20:31 2010
@@ -19,7 +19,7 @@
-package org.apache.james.impl.user;
+package org.apache.james.user.lib;
import org.apache.james.user.api.JamesUser;
import org.apache.mailet.MailAddress;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java (from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java&r1=1025889&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DefaultUser.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java Thu Oct 21 09:20:31 2010
@@ -19,7 +19,7 @@
-package org.apache.james.impl.user;
+package org.apache.james.user.lib;
import org.apache.james.user.api.User;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DigestUtil.java (from r1025884, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DigestUtil.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DigestUtil.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java&r1=1025884&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/DigestUtil.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DigestUtil.java Thu Oct 21 09:20:31 2010
@@ -19,7 +19,7 @@
-package org.apache.james.impl.user;
+package org.apache.james.user.lib;
import javax.mail.MessagingException;
import javax.mail.internet.MimeUtility;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersStore.java (from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/JamesUsersStore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersStore.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersStore.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/JamesUsersStore.java&r1=1025889&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/JamesUsersStore.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersStore.java Thu Oct 21 09:20:31 2010
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.impl.user;
+package org.apache.james.user.lib;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.impl.AbstractStore;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersStore;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/LocalJamesUsersRepository.java (from r1025895, 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/user/lib/LocalJamesUsersRepository.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/LocalJamesUsersRepository.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java&r1=1025895&r2=1025898&rev=1025898&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/user/lib/LocalJamesUsersRepository.java Thu Oct 21 09:20:31 2010
@@ -17,9 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.impl.jamesuser;
+package org.apache.james.user.lib;
-import org.apache.james.impl.user.LocalUsersRepository;
import org.apache.james.user.api.JamesUsersRepository;
import org.apache.james.vut.api.ErrorMappingException;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/LocalUsersRepository.java (from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/LocalUsersRepository.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/LocalUsersRepository.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java&r1=1025889&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/LocalUsersRepository.java Thu Oct 21 09:20:31 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.impl.user;
+package org.apache.james.user.lib;
import org.apache.james.user.api.User;
import org.apache.james.user.api.UsersRepository;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java (from r1025895, 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/user/lib/UserManagement.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java&r1=1025895&r2=1025898&rev=1025898&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/user/lib/UserManagement.java Thu Oct 21 09:20:31 2010
@@ -20,7 +20,7 @@
-package org.apache.james.impl.user;
+package org.apache.james.user.lib;
import java.util.ArrayList;
import java.util.Iterator;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java (from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java&r1=1025889&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java Thu Oct 21 09:20:31 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.impl.vut;
+package org.apache.james.vut.lib;
import java.util.ArrayList;
import java.util.Collection;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java (from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/JamesVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/JamesVirtualUserTable.java&r1=1025889&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/JamesVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/JamesVirtualUserTable.java Thu Oct 21 09:20:31 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.impl.vut;
+package org.apache.james.vut.lib;
import java.util.Collection;
import java.util.HashMap;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java (from r1025895, 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/vut/lib/VirtualUserTableManagement.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java&r1=1025895&r2=1025898&rev=1025898&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/vut/lib/VirtualUserTableManagement.java Thu Oct 21 09:20:31 2010
@@ -19,7 +19,7 @@
-package org.apache.james.impl.vut;
+package org.apache.james.vut.lib;
import java.util.ArrayList;
import java.util.Collection;
Copied: james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java (from r1025889, james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java&r1=1025889&r2=1025898&rev=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java Thu Oct 21 09:20:31 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.impl.vut;
+package org.apache.james.vut.lib;
import java.util.ArrayList;
import java.util.Collection;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/management/MockVirtualUserTableManagementImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/management/MockVirtualUserTableManagementImpl.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/management/MockVirtualUserTableManagementImpl.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/management/MockVirtualUserTableManagementImpl.java Thu Oct 21 09:20:31 2010
@@ -24,11 +24,11 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.impl.vut.VirtualUserTableUtil;
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 {
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=1025898&r1=1025897&r2=1025898&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:20:31 2010
@@ -26,8 +26,8 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.james.impl.user.UserManagement;
import org.apache.james.user.api.UserManagementException;
+import org.apache.james.user.lib.UserManagement;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.usersstore.MockUsersStore;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java Thu Oct 21 09:20:31 2010
@@ -19,11 +19,11 @@
package org.apache.james.userrepository;
-import org.apache.james.impl.jamesuser.AbstractUsersRepository;
-import org.apache.james.impl.user.DefaultJamesUser;
-import org.apache.james.impl.user.DefaultUser;
-import org.apache.james.impl.user.DigestUtil;
import org.apache.james.user.api.User;
+import org.apache.james.user.lib.AbstractUsersRepository;
+import org.apache.james.user.lib.DefaultJamesUser;
+import org.apache.james.user.lib.DefaultUser;
+import org.apache.james.user.lib.DigestUtil;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java Thu Oct 21 09:20:31 2010
@@ -21,10 +21,10 @@ package org.apache.james.userrepository;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.impl.user.DefaultJamesUser;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.user.api.User;
import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.lib.DefaultJamesUser;
import java.util.ArrayList;
import java.util.Iterator;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java?rev=1025898&r1=1025897&r2=1025898&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java Thu Oct 21 09:20:31 2010
@@ -24,11 +24,11 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.james.impl.vut.AbstractVirtualUserTable;
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.lib.AbstractVirtualUserTable;
/**
* The abstract test for the virtual user table.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org