Author: bago Date: Sun Aug 10 04:47:55 2008 New Revision: 684470 URL: http://svn.apache.org/viewvc?rev=684470&view=rev Log: Repackaging for the user api code, in progress. moved JamesUser to api (from library)
Added: james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java (contents, props changed) - copied, changed from r684466, james/server/trunk/user-library/src/main/java/org/apache/james/services/JamesUser.java Removed: james/server/trunk/user-library/src/main/java/org/apache/james/services/JamesUser.java Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java (original) +++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java Sun Aug 10 04:47:55 2008 @@ -23,9 +23,9 @@ import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.avalon.framework.container.ContainerUtil; import org.apache.avalon.framework.logger.ConsoleLogger; +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.services.JamesUser; import org.apache.james.test.mock.james.MockFileSystem; import org.apache.james.test.mock.util.AttrValConfiguration; import org.apache.james.test.util.Util; Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java (original) +++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java Sun Aug 10 04:47:55 2008 @@ -23,11 +23,11 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.avalon.framework.logger.ConsoleLogger; import org.apache.avalon.framework.service.DefaultServiceManager; +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.mailrepository.filepair.File_Persistent_Object_Repository; import org.apache.james.services.FileSystem; -import org.apache.james.services.JamesUser; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.james.test.mock.avalon.MockStore; import org.apache.mailet.MailAddress; Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java (original) +++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java Sun Aug 10 04:47:55 2008 @@ -25,8 +25,8 @@ import org.apache.avalon.excalibur.datasource.DataSourceComponent; import org.apache.avalon.framework.service.ServiceManager; import org.apache.james.Constants; +import org.apache.james.api.user.JamesUser; import org.apache.james.api.user.UsersRepository; -import org.apache.james.services.JamesUser; import org.apache.james.util.JDBCUtil; import org.apache.james.util.SqlResources; import org.apache.mailet.GenericMailet; Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java (original) +++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java Sun Aug 10 04:47:55 2008 @@ -25,8 +25,8 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.james.Constants; +import org.apache.james.api.user.JamesUser; import org.apache.james.api.user.UsersRepository; -import org.apache.james.services.JamesUser; import org.apache.james.services.MailRepository; import org.apache.james.services.MailServer; import org.apache.mailet.Mail; Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java (original) +++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java Sun Aug 10 04:47:55 2008 @@ -25,8 +25,8 @@ import org.apache.avalon.excalibur.datasource.DataSourceComponent; import org.apache.avalon.framework.service.ServiceManager; import org.apache.james.Constants; +import org.apache.james.api.user.JamesUser; import org.apache.james.api.user.UsersRepository; -import org.apache.james.services.JamesUser; import org.apache.james.transport.mailets.WhiteListManager; import org.apache.james.util.JDBCUtil; import org.apache.james.util.SqlResources; Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java (original) +++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java Sun Aug 10 04:47:55 2008 @@ -35,6 +35,7 @@ import javax.mail.internet.ParseException; import org.apache.james.Constants; +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.vut.management.VirtualUserTableManagementException; @@ -42,7 +43,6 @@ import org.apache.james.management.BayesianAnalyzerManagementException; import org.apache.james.management.DomainListManagementException; import org.apache.james.management.SpoolFilter; -import org.apache.james.services.JamesUser; import org.apache.james.services.ProcessorManagementService; import org.apache.mailet.MailAddress; Copied: james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java (from r684466, james/server/trunk/user-library/src/main/java/org/apache/james/services/JamesUser.java) URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java?p2=james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java&p1=james/server/trunk/user-library/src/main/java/org/apache/james/services/JamesUser.java&r1=684466&r2=684470&rev=684470&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/services/JamesUser.java (original) +++ james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java Sun Aug 10 04:47:55 2008 @@ -19,9 +19,8 @@ -package org.apache.james.services; +package org.apache.james.api.user; -import org.apache.james.api.user.User; import org.apache.mailet.MailAddress; /** Propchange: james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java ------------------------------------------------------------------------------ cvs2svn:cvs-rev = 1.4.4.3 Propchange: james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: james/server/trunk/user-api/src/main/java/org/apache/james/api/user/JamesUser.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagement.java Sun Aug 10 04:47:55 2008 @@ -25,12 +25,12 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; +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.api.user.management.UserManagementException; import org.apache.james.api.user.management.UserManagementMBean; -import org.apache.james.services.JamesUser; import org.apache.mailet.MailAddress; import javax.mail.internet.ParseException; Modified: james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/AbstractUsersRepository.java Sun Aug 10 04:47:55 2008 @@ -26,8 +26,8 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.james.api.user.ErrorMappingException; +import org.apache.james.api.user.JamesUser; import org.apache.james.api.user.User; -import org.apache.james.services.JamesUser; import org.apache.james.services.JamesUsersRepository; import java.util.ArrayList; Modified: james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java?rev=684470&r1=684469&r2=684470&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/userrepository/DefaultJamesUser.java Sun Aug 10 04:47:55 2008 @@ -21,7 +21,7 @@ package org.apache.james.userrepository; -import org.apache.james.services.JamesUser; +import org.apache.james.api.user.JamesUser; import org.apache.mailet.MailAddress; /** @@ -80,21 +80,21 @@ } /** - * @see org.apache.james.services.JamesUser#setForwarding(boolean) + * @see org.apache.james.api.user.JamesUser#setForwarding(boolean) */ public void setForwarding(boolean forward) { forwarding = forward; } /** - * @see org.apache.james.services.JamesUser#getForwarding() + * @see org.apache.james.api.user.JamesUser#getForwarding() */ public boolean getForwarding() { return forwarding; } /** - * @see org.apache.james.services.JamesUser#setForwardingDestination(org.apache.mailet.MailAddress) + * @see org.apache.james.api.user.JamesUser#setForwardingDestination(org.apache.mailet.MailAddress) */ public boolean setForwardingDestination(MailAddress address) { /* TODO: Some verification would be good */ @@ -103,28 +103,28 @@ } /** - * @see org.apache.james.services.JamesUser#getForwardingDestination() + * @see org.apache.james.api.user.JamesUser#getForwardingDestination() */ public MailAddress getForwardingDestination() { return forwardingDestination; } /** - * @see org.apache.james.services.JamesUser#setAliasing(boolean) + * @see org.apache.james.api.user.JamesUser#setAliasing(boolean) */ public void setAliasing(boolean alias) { aliasing = alias; } /** - * @see org.apache.james.services.JamesUser#getAliasing() + * @see org.apache.james.api.user.JamesUser#getAliasing() */ public boolean getAliasing() { return aliasing; } /** - * @see org.apache.james.services.JamesUser#setAlias(java.lang.String) + * @see org.apache.james.api.user.JamesUser#setAlias(java.lang.String) */ public boolean setAlias(String address) { /* TODO: Some verification would be good */ @@ -133,7 +133,7 @@ } /** - * @see org.apache.james.services.JamesUser#getAlias() + * @see org.apache.james.api.user.JamesUser#getAlias() */ public String getAlias() { return alias; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]