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 10:54:10 UTC
svn commit: r1025889 [1/2] - in /james/server/trunk:
fetchmail/src/main/java/org/apache/james/fetchmail/
mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/
mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/
m...
Author: eric
Date: Thu Oct 21 08:54:06 2010
New Revision: 1025889
URL: http://svn.apache.org/viewvc?rev=1025889&view=rev
Log:
Align packages hierarchy for user service - api part (JAMES1074)
Added:
james/server/trunk/user-api/src/main/java/org/apache/james/user/
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUser.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/User.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryException.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersStore.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/
- copied from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/
james/server/trunk/user-api/src/main/java/org/apache/james/vut/
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ErrorMappingException.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTable.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTable.java
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTableException.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTableException.java
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTable.java
- copied, changed from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/
- copied from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/
Removed:
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/User.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTable.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTableException.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/
Modified:
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
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/mailets/listservcommands/BaseCommand.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.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/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.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/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java
james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java
james/server/trunk/user-file/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
james/server/trunk/user-file/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
james/server/trunk/user-file/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/user-jcr/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java
james/server/trunk/user-jcr/src/main/java/org/apache/james/userrepository/model/JCRUser.java
james/server/trunk/user-jcr/src/test/java/org/apache/james/userrepository/JcrUserRepositoryTest.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/userrepository/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.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/userrepository/JPAUsersRepository.java
james/server/trunk/user-jpa/src/main/java/org/apache/james/userrepository/model/JPAUser.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/userrepository/JpaUsersRepositoryTest.java
james/server/trunk/user-jpa/src/test/java/org/apache/james/vut/JPAVirtualUserTableTest.java
james/server/trunk/user-ldap/src/main/java/org/apache/james/userrepository/ReadOnlyLDAPUser.java
james/server/trunk/user-ldap/src/main/java/org/apache/james/userrepository/ReadOnlyUsersLDAPRepository.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/JamesUsersRepository.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/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/vut/AbstractVirtualUserTable.java
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/impl/vut/VirtualUserTableManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.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/usersstore/MockUsersStore.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java Thu Oct 21 08:54:06 2010
@@ -39,11 +39,11 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.HierarchicalConfiguration.Node;
import org.apache.commons.logging.Log;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
/**
* <p>Class <code>FetchMail</code> is an Avalon task that is periodically
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java Thu Oct 21 08:54:06 2010
@@ -35,11 +35,11 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
/**
* A class to instantiate and schedule a set of mail fetching tasks
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java Thu Oct 21 08:54:06 2010
@@ -31,9 +31,9 @@ import javax.mail.internet.ParseExceptio
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java Thu Oct 21 08:54:06 2010
@@ -28,9 +28,9 @@ import javax.mail.MessagingException;
import javax.mail.Session;
import org.apache.commons.logging.Log;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java (original)
+++ james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java Thu Oct 21 08:54:06 2010
@@ -21,8 +21,8 @@ package org.apache.james.adapter.mailbox
import javax.annotation.Resource;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.mailbox.store.Authenticator;
+import org.apache.james.user.api.UsersRepository;
/**
* Authenticator which use an UsersRepository to check if the user and password match
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java Thu Oct 21 08:54:06 2010
@@ -38,13 +38,13 @@ import javax.mail.internet.MimeMessage;
import javax.mail.internet.ParseException;
import org.apache.commons.logging.Log;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
import org.apache.mailet.HostAddress;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java Thu Oct 21 08:54:06 2010
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
import org.apache.mailet.MailAddress;
import javax.annotation.Resource;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java Thu Oct 21 08:54:06 2010
@@ -23,8 +23,8 @@ package org.apache.james.transport.maile
import javax.annotation.Resource;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java Thu Oct 21 08:54:06 2010
@@ -24,10 +24,10 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.transport.mailets.listservcommands.ErrorCommand;
import org.apache.james.transport.mailets.listservcommands.IListServCommand;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
import org.apache.james.util.XMLResources;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java Thu Oct 21 08:54:06 2010
@@ -22,9 +22,9 @@
package org.apache.james.transport.mailets;
import org.apache.commons.configuration.Configuration;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.mailet.base.RFC2822Headers;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
import org.apache.james.util.XMLResources;
import org.apache.mailet.base.MailetUtil;
import org.apache.mailet.base.GenericMailet;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java Thu Oct 21 08:54:06 2010
@@ -23,7 +23,7 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.listservcommands.IListServCommand;
-import org.apache.james.api.user.UsersRepository;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mailet;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java Thu Oct 21 08:54:06 2010
@@ -21,10 +21,10 @@
package org.apache.james.transport.mailets;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetConfig;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Thu Oct 21 08:54:06 2010
@@ -28,10 +28,10 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
-import org.apache.james.api.vut.ErrorMappingException;
-import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
+import org.apache.james.vut.api.ErrorMappingException;
+import org.apache.james.vut.api.VirtualUserTable;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java Thu Oct 21 08:54:06 2010
@@ -26,7 +26,7 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.james.api.vut.ErrorMappingException;
+import org.apache.james.vut.api.ErrorMappingException;
import org.apache.mailet.MailAddress;
/**
@@ -36,14 +36,14 @@ import org.apache.mailet.MailAddress;
*
*/
public class VirtualUserTable extends AbstractVirtualUserTableMailet {
- private org.apache.james.api.vut.VirtualUserTable vut;
+ private org.apache.james.vut.api.VirtualUserTable vut;
/**
* Sets the virtual table store.
* @param vutStore the vutStore to set, possibly null
*/
@Resource(name="virtualusertable")
- public final void setVirtualUserTable(org.apache.james.api.vut.VirtualUserTable vut) {
+ public final void setVirtualUserTable(org.apache.james.vut.api.VirtualUserTable vut) {
this.vut = vut;
}
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=1025889&r1=1025888&r2=1025889&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 Oct 21 08:54:06 2010
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.UsersRepository;
+import org.apache.james.user.api.JamesUser;
+import org.apache.james.user.api.UsersRepository;
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/mailets/listservcommands/BaseCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java Thu Oct 21 08:54:06 2010
@@ -23,9 +23,9 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.mailet.base.RFC2822Headers;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java Thu Oct 21 08:54:06 2010
@@ -23,8 +23,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java Thu Oct 21 08:54:06 2010
@@ -23,8 +23,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java Thu Oct 21 08:54:06 2010
@@ -24,8 +24,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.util.XMLResources;
-import org.apache.james.api.user.UsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java Thu Oct 21 08:54:06 2010
@@ -23,8 +23,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java Thu Oct 21 08:54:06 2010
@@ -24,8 +24,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.util.XMLResources;
-import org.apache.james.api.user.UsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
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=1025889&r1=1025888&r2=1025889&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 Oct 21 08:54:06 2010
@@ -35,10 +35,10 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import javax.sql.DataSource;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.services.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.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=1025889&r1=1025888&r2=1025889&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 Oct 21 08:54:06 2010
@@ -27,8 +27,6 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import org.apache.commons.logging.Log;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MailboxConstants;
@@ -38,6 +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.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java Thu Oct 21 08:54:06 2010
@@ -29,7 +29,7 @@ import javax.mail.MessagingException;
import junit.framework.TestCase;
-import org.apache.james.api.vut.ErrorMappingException;
+import org.apache.james.vut.api.ErrorMappingException;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.base.test.FakeMail;
@@ -60,7 +60,7 @@ public class VirtualUserTableTest extend
FakeMailetConfig mockMailetConfig = new FakeMailetConfig("vut", mockMailetContext, new Properties());
//mockMailetConfig.put("virtualusertable", "vut");
- table.setVirtualUserTable(new org.apache.james.api.vut.VirtualUserTable() {
+ table.setVirtualUserTable(new org.apache.james.vut.api.VirtualUserTable() {
public Collection<String> getMappings(String user,
String domain) throws ErrorMappingException {
if (user.equals("test") && domain.equals("localhost"))
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -21,9 +21,9 @@ package org.apache.james.remotemanager.c
import javax.annotation.Resource;
-import org.apache.james.api.vut.ManageableVirtualUserTable;
-import org.apache.james.api.vut.ManageableVirtualUserTableException;
import org.apache.james.remotemanager.CommandHandler;
+import org.apache.james.vut.api.ManageableVirtualUserTable;
+import org.apache.james.vut.api.ManageableVirtualUserTableException;
public abstract class AbstractMappingCmdHandler implements CommandHandler {
@@ -33,7 +33,7 @@ public abstract class AbstractMappingCmd
@Resource(name="manageablevirtualusertable")
- public void setManageableVirtualUserTable(org.apache.james.api.vut.ManageableVirtualUserTable vut) {
+ public void setManageableVirtualUserTable(org.apache.james.vut.api.ManageableVirtualUserTable vut) {
this.vutManagement = vut;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.james.api.vut.ManageableVirtualUserTableException;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
+import org.apache.james.vut.api.ManageableVirtualUserTableException;
public class AddMappingCmdHandler extends AbstractMappingCmdHandler {
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -26,8 +26,6 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.domainlist.api.ManageableDomainList;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -36,6 +34,8 @@ import org.apache.james.remotemanager.Co
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
/**
* Handler method called upon receipt of an ADDUSER command.
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
+import org.apache.james.user.api.UsersRepository;
public class CountUsersCmdHandler extends ListUsersCmdHandler{
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -26,14 +26,14 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
/**
* Handler called upon receipt of an DELUSER command.
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -27,13 +27,13 @@ import java.util.Map;
import javax.annotation.Resource;
-import org.apache.james.api.vut.ManageableVirtualUserTable;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
+import org.apache.james.vut.api.ManageableVirtualUserTable;
public class ListAllMappingsCmdHandler implements CommandHandler {
private CommandHelp help = new CommandHelp("listallmappings","list all mappings");
@@ -44,7 +44,7 @@ public class ListAllMappingsCmdHandler i
@Resource(name="manageablevirtualusertable")
- public void setManageableVirtualUserTable(org.apache.james.api.vut.ManageableVirtualUserTable vut) {
+ public void setManageableVirtualUserTable(org.apache.james.vut.api.ManageableVirtualUserTable vut) {
this.vutManagement = vut;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -24,13 +24,13 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.james.api.vut.ManageableVirtualUserTable;
-import org.apache.james.api.vut.ManageableVirtualUserTableException;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
+import org.apache.james.vut.api.ManageableVirtualUserTable;
+import org.apache.james.vut.api.ManageableVirtualUserTableException;
public class ListMappingCmdHandler extends AbstractMappingCmdHandler {
private CommandHelp help = new CommandHelp("listmapping [user@domain]","list all mappings for the given emailaddress");
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -26,8 +26,6 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
@@ -35,6 +33,8 @@ import org.apache.james.remotemanager.Co
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
public class ListUsersCmdHandler implements CommandHandler{
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.james.api.vut.ManageableVirtualUserTableException;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
+import org.apache.james.vut.api.ManageableVirtualUserTableException;
public class RemoveMappingCmdHandler extends AbstractMappingCmdHandler {
private CommandHelp help = new CommandHelp("removemapping [toUser@toDomain] [fromMapping]","remove mapping for the given emailaddress");
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=1025889&r1=1025888&r2=1025889&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 Oct 21 08:54:06 2010
@@ -26,15 +26,15 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.User;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
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.UsersStore;
/**
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=1025889&r1=1025888&r2=1025889&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 Oct 21 08:54:06 2010
@@ -25,16 +25,16 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.User;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
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.UsersStore;
/**
* 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=1025889&r1=1025888&r2=1025889&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 Oct 21 08:54:06 2010
@@ -25,16 +25,16 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.User;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
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.UsersStore;
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=1025889&r1=1025888&r2=1025889&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 Oct 21 08:54:06 2010
@@ -25,15 +25,15 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
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.UsersStore;
/**
* 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=1025889&r1=1025888&r2=1025889&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 Oct 21 08:54:06 2010
@@ -25,15 +25,15 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
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.UsersStore;
/**
* Handler called upon receipt of an UNSETFORWARDING command.
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -7,14 +7,14 @@ import java.util.Locale;
import javax.annotation.Resource;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
/**
* Handler called upon receipt of a USER command
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java Thu Oct 21 08:54:06 2010
@@ -25,14 +25,14 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.remotemanager.CommandHandler;
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.user.api.UsersStore;
/**
* Handler method called upon receipt of an VERIFY command.
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java Thu Oct 21 08:54:06 2010
@@ -20,11 +20,11 @@ package org.apache.james.smtpserver;
import javax.annotation.Resource;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.AuthHook;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.user.api.UsersRepository;
/**
* This Auth hook can be used to authenticate against the james user repository
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Thu Oct 21 08:54:06 2010
@@ -25,13 +25,13 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.vut.ErrorMappingException;
-import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler;
import org.apache.james.services.MailServer;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.vut.api.ErrorMappingException;
+import org.apache.james.vut.api.VirtualUserTable;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Thu Oct 21 08:54:06 2010
@@ -42,8 +42,6 @@ import org.apache.commons.logging.impl.S
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.james.services.MockJSR250Loader;
-import org.apache.james.api.vut.ErrorMappingException;
-import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailstore.MockMailStore;
@@ -53,6 +51,8 @@ import org.apache.james.socket.JamesProt
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.TestUtil;
import org.apache.james.util.codec.Base64;
+import org.apache.james.vut.api.ErrorMappingException;
+import org.apache.james.vut.api.VirtualUserTable;
import org.apache.mailet.HostAddress;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Thu Oct 21 08:54:06 2010
@@ -31,16 +31,16 @@ import javax.mail.MessagingException;
import junit.framework.TestCase;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.vut.ErrorMappingException;
-import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.userrepository.MockUsersRepository;
+import org.apache.james.vut.api.ErrorMappingException;
+import org.apache.james.vut.api.VirtualUserTable;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUser.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUser.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUser.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUser.java Thu Oct 21 08:54:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.api.user;
+package org.apache.james.user.api;
import org.apache.mailet.MailAddress;
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/User.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/User.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/User.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/User.java Thu Oct 21 08:54:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.api.user;
+package org.apache.james.user.api;
/**
* Interface for objects representing users.
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java Thu Oct 21 08:54:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.api.user;
+package org.apache.james.user.api;
import java.util.Iterator;
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryException.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryException.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryException.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepositoryException.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepositoryException.java Thu Oct 21 08:54:06 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.api.user;
+package org.apache.james.user.api;
/**
* Basic user repository exception.
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersStore.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersStore.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersStore.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersStore.java Thu Oct 21 08:54:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.api.user;
+package org.apache.james.user.api;
import java.util.Iterator;
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java?rev=1025889&r1=1025884&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementException.java Thu Oct 21 08:54:06 2010
@@ -20,7 +20,7 @@
-package org.apache.james.api.user.management;
+package org.apache.james.user.api.management;
public class UserManagementException extends Exception {
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java?rev=1025889&r1=1025884&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/management/UserManagementMBean.java Thu Oct 21 08:54:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.api.user.management;
+package org.apache.james.user.api.management;
import java.util.List;
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ErrorMappingException.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ErrorMappingException.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ErrorMappingException.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ErrorMappingException.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ErrorMappingException.java Thu Oct 21 08:54:06 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.api.vut;
+package org.apache.james.vut.api;
public class ErrorMappingException extends Exception {
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTable.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTable.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTable.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTable.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTable.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTable.java Thu Oct 21 08:54:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.api.vut;
+package org.apache.james.vut.api;
import java.util.Collection;
import java.util.Map;
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTableException.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTableException.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTableException.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTableException.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTableException.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/ManageableVirtualUserTableException.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/ManageableVirtualUserTableException.java Thu Oct 21 08:54:06 2010
@@ -20,7 +20,7 @@
-package org.apache.james.api.vut;
+package org.apache.james.vut.api;
public class ManageableVirtualUserTableException extends Exception {
Copied: james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTable.java (from r1025884, james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTable.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTable.java&p1=james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java&r1=1025884&r2=1025889&rev=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/VirtualUserTable.java Thu Oct 21 08:54:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.vut;
+package org.apache.james.vut.api;
import java.util.Collection;
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java?rev=1025889&r1=1025884&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/vut/api/management/VirtualUserTableManagementMBean.java Thu Oct 21 08:54:06 2010
@@ -19,7 +19,7 @@
-package org.apache.james.api.vut.management;
+package org.apache.james.vut.api.management;
import java.util.Collection;
import java.util.Map;
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=1025889&r1=1025888&r2=1025889&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 08:54:06 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.api.user.User;
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 java.util.Iterator;
@@ -121,14 +121,14 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#list()
+ * @see org.apache.james.user.api.UsersRepository#list()
*/
public Iterator<String> list() {
return objectRepository.list();
}
/**
- * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doAddUser(org.apache.james.api.user.User)
+ * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doAddUser(org.apache.james.user.api.User)
*/
protected void doAddUser(User user) {
try {
@@ -139,7 +139,7 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
User newbie = new DefaultJamesUser(username, "SHA");
@@ -148,7 +148,7 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#getUserByName(java.lang.String)
+ * @see org.apache.james.user.api.UsersRepository#getUserByName(java.lang.String)
*/
public synchronized User getUserByName(String name) {
if (ignoreCase) {
@@ -170,7 +170,7 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
+ * @see org.apache.james.user.api.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
*/
public User getUserByNameCaseInsensitive(String name) {
String realName = getRealName(name, true);
@@ -199,14 +199,14 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#getRealName(java.lang.String)
+ * @see org.apache.james.user.api.UsersRepository#getRealName(java.lang.String)
*/
public String getRealName(String name) {
return getRealName(name, ignoreCase);
}
/**
- * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doUpdateUser(org.apache.james.api.user.User)
+ * @see org.apache.james.impl.jamesuser.AbstractUsersRepository#doUpdateUser(org.apache.james.user.api.User)
*/
public void doUpdateUser(User user) {
try {
@@ -218,14 +218,14 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#removeUser(java.lang.String)
+ * @see org.apache.james.user.api.UsersRepository#removeUser(java.lang.String)
*/
public synchronized void removeUser(String name) {
objectRepository.remove(name);
}
/**
- * @see org.apache.james.api.user.UsersRepository#contains(java.lang.String)
+ * @see org.apache.james.user.api.UsersRepository#contains(java.lang.String)
*/
public boolean contains(String name) {
if (ignoreCase) {
@@ -236,7 +236,7 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#containsCaseInsensitive(java.lang.String)
+ * @see org.apache.james.user.api.UsersRepository#containsCaseInsensitive(java.lang.String)
*/
public boolean containsCaseInsensitive(String name) {
Iterator<String> it = list();
@@ -249,7 +249,7 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#test(java.lang.String, java.lang.String)
+ * @see org.apache.james.user.api.UsersRepository#test(java.lang.String, java.lang.String)
*/
public boolean test(String name, String password) {
User user;
@@ -263,7 +263,7 @@ public class UsersFileRepository
}
/**
- * @see org.apache.james.api.user.UsersRepository#countUsers()
+ * @see org.apache.james.user.api.UsersRepository#countUsers()
*/
public int countUsers() {
int count = 0;
Modified: james/server/trunk/user-file/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/user-file/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/user-file/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java Thu Oct 21 08:54:06 2010
@@ -29,13 +29,13 @@ import java.util.Iterator;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.api.user.JamesUser;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.filepair.FilePersistentObjectRepository;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailstore.MockMailStore;
import org.apache.james.services.FileSystem;
+import org.apache.james.user.api.JamesUser;
+import org.apache.james.user.api.UsersRepository;
+import org.apache.james.vut.api.VirtualUserTable;
import org.apache.mailet.MailAddress;
/**
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=1025889&r1=1025888&r2=1025889&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 08:54:06 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.api.vut.ManageableVirtualUserTableException;
-import org.apache.james.api.vut.VirtualUserTable;
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;
/**
* Test the XML Virtual User Table implementation.
Modified: james/server/trunk/user-jcr/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jcr/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java?rev=1025889&r1=1025888&r2=1025889&view=diff
==============================================================================
--- james/server/trunk/user-jcr/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java (original)
+++ james/server/trunk/user-jcr/src/main/java/org/apache/james/userrepository/JCRUsersRepository.java Thu Oct 21 08:54:06 2010
@@ -37,10 +37,10 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.util.Text;
-import org.apache.james.api.user.User;
-import org.apache.james.api.user.UsersRepository;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.user.api.User;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.userrepository.model.JCRUser;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org