Author: norman
Date: Thu Dec 16 14:39:14 2010
New Revision: 1049992

URL: http://svn.apache.org/viewvc?rev=1049992&view=rev
Log:
move User and JamesUser implementations to model package

Added:
    
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/
    
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
      - copied, changed from r1049990, 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java
    
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
      - copied, changed from r1049990, 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java
Removed:
    
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java
    
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java
Modified:
    
james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
    
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
    
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
    
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
    
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
    
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
    
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java

Modified: 
james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java?rev=1049992&r1=1049991&r2=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
 (original)
+++ 
james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
 Thu Dec 16 14:39:14 2010
@@ -28,7 +28,7 @@ import org.apache.james.mailstore.api.Ma
 import org.apache.james.repository.api.ObjectRepository;
 import org.apache.james.user.api.model.User;
 import org.apache.james.user.lib.AbstractJamesUsersRepository;
-import org.apache.james.user.lib.DefaultJamesUser;
+import org.apache.james.user.lib.model.DefaultJamesUser;
 
 
 import java.util.Iterator;

Modified: 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java?rev=1049992&r1=1049991&r2=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
 (original)
+++ 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
 Thu Dec 16 14:39:14 2010
@@ -22,7 +22,7 @@
 package org.apache.james.user.jdbc;
 
 import org.apache.james.user.api.model.User;
-import org.apache.james.user.lib.DefaultUser;
+import org.apache.james.user.lib.model.DefaultUser;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

Modified: 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java?rev=1049992&r1=1049991&r2=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
 (original)
+++ 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
 Thu Dec 16 14:39:14 2010
@@ -22,8 +22,8 @@
 package org.apache.james.user.jdbc;
 
 import org.apache.james.user.api.model.User;
-import org.apache.james.user.lib.DefaultJamesUser;
-import org.apache.james.user.lib.DefaultUser;
+import org.apache.james.user.lib.model.DefaultJamesUser;
+import org.apache.james.user.lib.model.DefaultUser;
 import org.apache.mailet.MailAddress;
 
 import java.sql.PreparedStatement;

Modified: 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java?rev=1049992&r1=1049991&r2=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
 (original)
+++ 
james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/ListUsersJdbcRepository.java
 Thu Dec 16 14:39:14 2010
@@ -22,7 +22,7 @@
 package org.apache.james.user.jdbc;
 
 import org.apache.james.user.api.model.User;
-import org.apache.james.user.lib.DefaultUser;
+import org.apache.james.user.lib.model.DefaultUser;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

Modified: 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java?rev=1049992&r1=1049991&r2=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
 (original)
+++ 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
 Thu Dec 16 14:39:14 2010
@@ -30,6 +30,7 @@ import org.apache.james.user.api.JamesUs
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.model.JamesUser;
 import org.apache.james.user.api.model.User;
+import org.apache.james.user.lib.model.DefaultUser;
 import org.apache.james.vut.lib.AbstractReadOnlyVirtualUserTable;
 
 import java.util.ArrayList;

Copied: 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
 (from r1049990, 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java)
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java&r1=1049990&r2=1049992&rev=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultJamesUser.java
 (original)
+++ 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
 Thu Dec 16 14:39:14 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.user.lib;
+package org.apache.james.user.lib.model;
 
 import org.apache.james.user.api.model.JamesUser;
 import org.apache.mailet.MailAddress;

Copied: 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
 (from r1049990, 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java)
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java?p2=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java&r1=1049990&r2=1049992&rev=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/DefaultUser.java
 (original)
+++ 
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
 Thu Dec 16 14:39:14 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.user.lib;
+package org.apache.james.user.lib.model;
 
 import org.apache.james.user.api.model.User;
 import org.apache.james.user.lib.util.DigestUtil;

Modified: 
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java?rev=1049992&r1=1049991&r2=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
 (original)
+++ 
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
 Thu Dec 16 14:39:14 2010
@@ -24,8 +24,8 @@ import org.apache.commons.logging.impl.S
 import org.apache.james.lifecycle.api.LifecycleUtil;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.model.User;
-import org.apache.james.user.lib.DefaultJamesUser;
 import org.apache.james.user.lib.mock.MockUsersRepository;
+import org.apache.james.user.lib.model.DefaultJamesUser;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: 
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java?rev=1049992&r1=1049991&r2=1049992&view=diff
==============================================================================
--- 
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
 (original)
+++ 
james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
 Thu Dec 16 14:39:14 2010
@@ -21,8 +21,8 @@ package org.apache.james.user.lib.mock;
 
 import org.apache.james.user.api.model.User;
 import org.apache.james.user.lib.AbstractJamesUsersRepository;
-import org.apache.james.user.lib.DefaultJamesUser;
-import org.apache.james.user.lib.DefaultUser;
+import org.apache.james.user.lib.model.DefaultJamesUser;
+import org.apache.james.user.lib.model.DefaultUser;
 import org.apache.james.user.lib.util.DigestUtil;
 
 import java.security.NoSuchAlgorithmException;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to