james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1049990 - in /james/server/trunk: mailets/src/main/java/org/apache/james/transport/mailets/ mailets/src/main/java/org/apache/james/transport/matchers/ remotemanager/src/main/java/org/apache/james/remotemanager/core/ user-api/src/main/java/...
Date Thu, 16 Dec 2010 14:37:02 GMT
Author: norman
Date: Thu Dec 16 14:37:01 2010
New Revision: 1049990

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

Added:
    james/server/trunk/user-api/src/main/java/org/apache/james/user/api/model/
    james/server/trunk/user-api/src/main/java/org/apache/james/user/api/model/JamesUser.java
      - copied, changed from r1049797, james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUser.java
    james/server/trunk/user-api/src/main/java/org/apache/james/user/api/model/User.java
      - copied, changed from r1049797, james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java
Removed:
    james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUser.java
    james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java
Modified:
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
    james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java
    james/server/trunk/user-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
    james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
    james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
    james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
    james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.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-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
    james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
    james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
    james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
    james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
    james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
    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
    james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java
    james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.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/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
Thu Dec 16 14:37:01 2010
@@ -21,8 +21,8 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.user.api.JamesUser;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
 import org.apache.james.util.sql.JDBCUtil;
 import org.apache.james.util.sql.SqlResources;
 import org.apache.mailet.base.GenericMailet;

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
Thu Dec 16 14:37:01 2010
@@ -37,8 +37,8 @@ import javax.sql.DataSource;
 
 import org.apache.james.resolver.api.FileSystem;
 import org.apache.james.transport.mailets.WhiteListManager;
-import org.apache.james.user.api.JamesUser;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
 import org.apache.james.util.sql.JDBCUtil;
 import org.apache.james.util.sql.SqlResources;
 import org.apache.mailet.Mail;

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
Thu Dec 16 14:37:01 2010
@@ -36,8 +36,8 @@ import org.apache.james.mailbox.MessageR
 import org.apache.james.mailbox.MessageResult;
 import org.apache.james.mailbox.MessageResult.FetchGroup;
 import org.apache.james.mailbox.util.FetchGroupImpl;
-import org.apache.james.user.api.JamesUser;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.MailetContext;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
(original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
Thu Dec 16 14:37:01 2010
@@ -32,8 +32,8 @@ import org.apache.james.remotemanager.Co
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;
-import org.apache.james.user.api.User;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.User;
 
 
 /**

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
(original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
Thu Dec 16 14:37:01 2010
@@ -31,9 +31,9 @@ import org.apache.james.remotemanager.Co
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;
-import org.apache.james.user.api.JamesUser;
-import org.apache.james.user.api.User;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
+import org.apache.james.user.api.model.User;
 
 /**
  * Handler called upon receipt of an SHOWALIAS command.

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
(original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
Thu Dec 16 14:37:01 2010
@@ -31,9 +31,9 @@ import org.apache.james.remotemanager.Co
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;
-import org.apache.james.user.api.JamesUser;
-import org.apache.james.user.api.User;
 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.mailet.MailAddress;
 
 /**

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
(original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
Thu Dec 16 14:37:01 2010
@@ -31,8 +31,8 @@ import org.apache.james.remotemanager.Co
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;
-import org.apache.james.user.api.JamesUser;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
 
 /**
  * Handler called upon receipt of an UNSETALIAS command.

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
(original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
Thu Dec 16 14:37:01 2010
@@ -31,8 +31,8 @@ import org.apache.james.remotemanager.Co
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;
-import org.apache.james.user.api.JamesUser;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
 
 /**
  * Handler called upon receipt of an UNSETFORWARDING command.

Modified: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java
(original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java
Thu Dec 16 14:37:01 2010
@@ -23,6 +23,8 @@ package org.apache.james.user.api;
 
 import java.util.Iterator;
 
+import org.apache.james.user.api.model.User;
+
 /**
  * Interface for a repository of users. A repository represents a logical
  * grouping of users, typically by common purpose. E.g. the users served by an

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

Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/model/User.java
(from r1049797, james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/model/User.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/model/User.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java&r1=1049797&r2=1049990&rev=1049990&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/model/User.java Thu
Dec 16 14:37:01 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.user.api;
+package org.apache.james.user.api.model;
 
 /**
  * Interface for objects representing users.

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=1049990&r1=1049989&r2=1049990&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:37:01 2010
@@ -26,7 +26,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.james.mailstore.api.MailStore;
 import org.apache.james.repository.api.ObjectRepository;
-import org.apache.james.user.api.User;
+import org.apache.james.user.api.model.User;
 import org.apache.james.user.lib.AbstractJamesUsersRepository;
 import org.apache.james.user.lib.DefaultJamesUser;
 
@@ -129,7 +129,7 @@ public class UsersFileRepository
     }
 
     /**
-     * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doAddUser(org.apache.james.user.api.User)
+     * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doAddUser(org.apache.james.user.api.model.User)
      */
     protected void doAddUser(User user) {
         try {
@@ -207,7 +207,7 @@ public class UsersFileRepository
     }
     
     /**
-     * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doUpdateUser(org.apache.james.user.api.User)
+     * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doUpdateUser(org.apache.james.user.api.model.User)
      */
     public void doUpdateUser(User user) {
         try {

Modified: james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
(original)
+++ james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
Thu Dec 16 14:37:01 2010
@@ -33,8 +33,8 @@ import org.apache.james.lifecycle.api.Li
 import org.apache.james.mailstore.mock.MockMailStore;
 import org.apache.james.repository.file.FilePersistentObjectRepository;
 import org.apache.james.resolver.api.FileSystem;
-import org.apache.james.user.api.JamesUser;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
 import org.apache.james.user.file.UsersFileRepository;
 import org.apache.james.user.lib.MockUsersRepositoryTest;
 import org.apache.james.vut.api.VirtualUserTable;

Modified: james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
(original)
+++ james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
Thu Dec 16 14:37:01 2010
@@ -39,8 +39,8 @@ import org.apache.jackrabbit.util.ISO907
 import org.apache.jackrabbit.util.Text;
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.lifecycle.api.LogEnabled;
-import org.apache.james.user.api.User;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.User;
 import org.apache.james.user.jcr.model.JCRUser;
 
 /**

Modified: james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
(original)
+++ james/server/trunk/user-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
Thu Dec 16 14:37:01 2010
@@ -20,7 +20,7 @@
 package org.apache.james.user.jcr.model;
 
 import org.apache.jackrabbit.util.Text;
-import org.apache.james.user.api.User;
+import org.apache.james.user.api.model.User;
 
 /**
  * User backed by JCR data. 

Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
(original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
Thu Dec 16 14:37:01 2010
@@ -22,7 +22,7 @@ package org.apache.james.user.jdbc;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.james.resolver.api.FileSystem;
-import org.apache.james.user.api.User;
+import org.apache.james.user.api.model.User;
 import org.apache.james.user.lib.AbstractJamesUsersRepository;
 import org.apache.james.util.sql.JDBCUtil;
 import org.apache.james.util.sql.SqlResources;

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=1049990&r1=1049989&r2=1049990&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:37:01 2010
@@ -21,7 +21,7 @@
 
 package org.apache.james.user.jdbc;
 
-import org.apache.james.user.api.User;
+import org.apache.james.user.api.model.User;
 import org.apache.james.user.lib.DefaultUser;
 
 import java.sql.PreparedStatement;
@@ -61,7 +61,7 @@ public class DefaultUsersJdbcRepository 
     }
 
     /**
-     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
+     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.model.User,
java.sql.PreparedStatement)
      */
     protected void setUserForInsertStatement(User user, 
                                              PreparedStatement userInsert) 
@@ -74,7 +74,7 @@ public class DefaultUsersJdbcRepository 
     }
 
     /**
-     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
+     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.model.User,
java.sql.PreparedStatement)
      */
     protected void setUserForUpdateStatement(User user, 
                                              PreparedStatement userUpdate) 

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=1049990&r1=1049989&r2=1049990&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:37:01 2010
@@ -21,7 +21,7 @@
 
 package org.apache.james.user.jdbc;
 
-import org.apache.james.user.api.User;
+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.mailet.MailAddress;
@@ -76,7 +76,7 @@ public class JamesUsersJdbcRepository ex
 
 
     /**
-     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
+     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.model.User,
      *      java.sql.PreparedStatement)
      */
     protected void setUserForInsertStatement(User user, 
@@ -85,7 +85,7 @@ public class JamesUsersJdbcRepository ex
     }
 
     /**
-     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.User,
+     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.user.api.model.User,
      *      java.sql.PreparedStatement)
      */
     protected void setUserForUpdateStatement(User user, 

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=1049990&r1=1049989&r2=1049990&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:37:01 2010
@@ -21,7 +21,7 @@
 
 package org.apache.james.user.jdbc;
 
-import org.apache.james.user.api.User;
+import org.apache.james.user.api.model.User;
 import org.apache.james.user.lib.DefaultUser;
 
 import java.sql.PreparedStatement;
@@ -58,7 +58,7 @@ public class ListUsersJdbcRepository ext
     }
 
     /**
-     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.User,
java.sql.PreparedStatement)
+     * @see org.apache.james.user.jdbc.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.user.api.model.User,
java.sql.PreparedStatement)
      */
     protected void setUserForInsertStatement(User user, 
                                              PreparedStatement userInsert) 

Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
(original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
Thu Dec 16 14:37:01 2010
@@ -27,8 +27,8 @@ import org.apache.commons.logging.impl.S
 import org.apache.derby.jdbc.EmbeddedDriver;
 import org.apache.james.lifecycle.api.LifecycleUtil;
 import org.apache.james.resolver.api.mock.MockFileSystem;
-import org.apache.james.user.api.JamesUser;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
 import org.apache.james.user.jdbc.AbstractJdbcUsersRepository;
 import org.apache.james.user.jdbc.JamesUsersJdbcRepository;
 import org.apache.james.user.lib.MockUsersRepositoryTest;

Modified: james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
(original)
+++ james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
Thu Dec 16 14:37:01 2010
@@ -35,8 +35,8 @@ import org.apache.commons.configuration.
 import org.apache.commons.logging.Log;
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.lifecycle.api.LogEnabled;
-import org.apache.james.user.api.User;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.User;
 import org.apache.james.user.jpa.model.JPAUser;
 
 

Modified: james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
(original)
+++ james/server/trunk/user-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java
Thu Dec 16 14:37:01 2010
@@ -27,7 +27,7 @@ import javax.persistence.NamedQuery;
 import javax.persistence.Version;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.james.user.api.User;
+import org.apache.james.user.api.model.User;
 
 @Entity(name = "JamesUser")
 @NamedQueries( { 

Modified: james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
(original)
+++ james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPUser.java
Thu Dec 16 14:37:01 2010
@@ -23,7 +23,7 @@ import java.io.Serializable;
 
 import javax.naming.NamingException;
 
-import org.apache.james.user.api.User;
+import org.apache.james.user.api.model.User;
 
 /**
  * <p>

Modified: james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
(original)
+++ james/server/trunk/user-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
Thu Dec 16 14:37:01 2010
@@ -40,8 +40,8 @@ import org.apache.commons.configuration.
 import org.apache.commons.logging.Log;
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.lifecycle.api.LogEnabled;
-import org.apache.james.user.api.User;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.User;
 
 /**
  * <p>

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=1049990&r1=1049989&r2=1049990&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:37:01 2010
@@ -26,10 +26,10 @@ import org.apache.commons.configuration.
 import org.apache.commons.logging.Log;
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.lifecycle.api.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.user.api.UsersRepository;
+import org.apache.james.user.api.model.JamesUser;
+import org.apache.james.user.api.model.User;
 import org.apache.james.vut.lib.AbstractReadOnlyVirtualUserTable;
 
 import java.util.ArrayList;

Modified: 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/DefaultJamesUser.java?rev=1049990&r1=1049989&r2=1049990&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/DefaultJamesUser.java
Thu Dec 16 14:37:01 2010
@@ -21,7 +21,7 @@
 
 package org.apache.james.user.lib;
 
-import org.apache.james.user.api.JamesUser;
+import org.apache.james.user.api.model.JamesUser;
 import org.apache.mailet.MailAddress;
 
 /**
@@ -80,21 +80,21 @@ public class DefaultJamesUser 
     }
 
     /**
-     * @see org.apache.james.user.api.JamesUser#setForwarding(boolean)
+     * @see org.apache.james.user.api.model.JamesUser#setForwarding(boolean)
      */
     public void setForwarding(boolean forward) {
         forwarding = forward;
     }
 
     /**
-     * @see org.apache.james.user.api.JamesUser#getForwarding()
+     * @see org.apache.james.user.api.model.JamesUser#getForwarding()
      */
     public boolean getForwarding() {
         return forwarding;
     }
 
     /**
-     * @see org.apache.james.user.api.JamesUser#setForwardingDestination(org.apache.mailet.MailAddress)
+     * @see org.apache.james.user.api.model.JamesUser#setForwardingDestination(org.apache.mailet.MailAddress)
      */
     public boolean setForwardingDestination(MailAddress address) {
         /* TODO: Some verification would be good */
@@ -103,28 +103,28 @@ public class DefaultJamesUser 
     }
 
     /**
-     * @see org.apache.james.user.api.JamesUser#getForwardingDestination()
+     * @see org.apache.james.user.api.model.JamesUser#getForwardingDestination()
      */
     public MailAddress getForwardingDestination() {
         return forwardingDestination;
     }
 
     /**
-     * @see org.apache.james.user.api.JamesUser#setAliasing(boolean)
+     * @see org.apache.james.user.api.model.JamesUser#setAliasing(boolean)
      */
     public void setAliasing(boolean alias) {
         aliasing = alias;
     }
 
     /**
-     * @see org.apache.james.user.api.JamesUser#getAliasing()
+     * @see org.apache.james.user.api.model.JamesUser#getAliasing()
      */
     public boolean getAliasing() {
         return aliasing;
     }
 
     /**
-     * @see org.apache.james.user.api.JamesUser#setAlias(java.lang.String)
+     * @see org.apache.james.user.api.model.JamesUser#setAlias(java.lang.String)
      */
     public boolean setAlias(String address) {
         /* TODO: Some verification would be good */
@@ -133,7 +133,7 @@ public class DefaultJamesUser 
     }
 
     /**
-     * @see org.apache.james.user.api.JamesUser#getAlias()
+     * @see org.apache.james.user.api.model.JamesUser#getAlias()
      */
     public String getAlias() {
         return alias;

Modified: 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/DefaultUser.java?rev=1049990&r1=1049989&r2=1049990&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/DefaultUser.java
Thu Dec 16 14:37:01 2010
@@ -21,7 +21,7 @@
 
 package org.apache.james.user.lib;
 
-import org.apache.james.user.api.User;
+import org.apache.james.user.api.model.User;
 import org.apache.james.user.lib.util.DigestUtil;
 
 import java.io.Serializable;
@@ -70,14 +70,14 @@ public class DefaultUser implements User
     }
 
     /**
-     * @see org.apache.james.user.api.User#getUserName()
+     * @see org.apache.james.user.api.model.User#getUserName()
      */
     public String getUserName() {
         return userName;
     }
 
     /**
-     * @see org.apache.james.user.api.User#verifyPassword(java.lang.String)
+     * @see org.apache.james.user.api.model.User#verifyPassword(java.lang.String)
      */
     public boolean verifyPassword(String pass) {
         try {
@@ -89,7 +89,7 @@ public class DefaultUser implements User
     }
 
     /**
-     * @see org.apache.james.user.api.User#setPassword(java.lang.String)
+     * @see org.apache.james.user.api.model.User#setPassword(java.lang.String)
      */
     public boolean setPassword(String newPass) {
         try {

Modified: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java?rev=1049990&r1=1049989&r2=1049990&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java
(original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/JamesUsersRepository.java
Thu Dec 16 14:37:01 2010
@@ -32,8 +32,8 @@ import org.apache.commons.logging.Log;
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.lifecycle.api.LogEnabled;
 import org.apache.james.resolver.api.InstanceFactory;
-import org.apache.james.user.api.User;
 import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.model.User;
 
 /**
  * UsersStore implementation which will parse the configuration file for users-store and
add every configured repository 

Modified: 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/UserManagement.java?rev=1049990&r1=1049989&r2=1049990&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/UserManagement.java
Thu Dec 16 14:37:01 2010
@@ -30,10 +30,10 @@ import javax.annotation.Resource;
 import javax.management.NotCompliantMBeanException;
 import javax.management.StandardMBean;
 
-import org.apache.james.user.api.JamesUser;
-import org.apache.james.user.api.User;
 import org.apache.james.user.api.UserManagementMBean;
 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 {
     

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=1049990&r1=1049989&r2=1049990&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:37:01 2010
@@ -22,8 +22,8 @@ package org.apache.james.user.lib;
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.user.api.User;
 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;
 

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=1049990&r1=1049989&r2=1049990&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:37:01 2010
@@ -19,7 +19,7 @@
 
 package org.apache.james.user.lib.mock;
 
-import org.apache.james.user.api.User;
+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;



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message