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 da...@apache.org on 2006/10/27 18:14:51 UTC
svn commit: r468439 [1/2] - in
/james/server/sandbox/mailet-refactorings/src: conf/ java/org/apache/james/
java/org/apache/james/core/ java/org/apache/james/fetchmail/
java/org/apache/james/imapserver/
java/org/apache/james/imapserver/commands/ java/or...
Author: danny
Date: Fri Oct 27 09:14:47 2006
New Revision: 468439
URL: http://svn.apache.org/viewvc?view=rev&rev=468439
Log:
refactored UsersRepository and Users interfaces into Mailet from James
Added:
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/AliasedUser.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/ForwardingUser.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/User.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/mailet/UsersRepository.java
Removed:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/MailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/User.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/UsersRepository.java
Modified:
james/server/sandbox/mailet-refactorings/src/conf/james-assembly.xml
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/AvalonUsersStore.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalJamesUsersRepository.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchMail.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ParsedConfiguration.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ProcessorAbstract.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandler.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSession.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSessionImpl.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/commands/LoginCommand.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/acl/GroupAwareUser.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/BasicManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/GeneralManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/QuotaManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUser.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUsersRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/UsersStore.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.xinfo
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListservManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/WhiteListManager.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Info.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/IsInWhiteList.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractUsersRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUser.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersFileRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/UsersLDAPRepository.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/JamesTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/handler/commands/AbstractCommandTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUser.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockUsersRepository.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/mock/MockUser.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/management/UserManagementTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/SMTPServerTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockUsersStore.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepository.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/MockUsersRepositoryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java
Modified: james/server/sandbox/mailet-refactorings/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/conf/james-assembly.xml?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/conf/james-assembly.xml (original)
+++ james/server/sandbox/mailet-refactorings/src/conf/james-assembly.xml Fri Oct 27 09:14:47 2006
@@ -27,7 +27,7 @@
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
<provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/>
<provide name="users-store" role="org.apache.james.services.UsersStore"/>
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.mailet.UsersRepository"/>
<provide name="spoolrepository" role="org.apache.james.services.SpoolRepository"/>
<provide name="filesystem" role="org.apache.james.services.FileSystem" />
<provide name="domainlist" role="org.apache.james.services.DomainList" />
@@ -76,7 +76,7 @@
<block name="remotemanager" class="org.apache.james.remotemanager.RemoteManager" >
<provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/>
<provide name="users-store" role="org.apache.james.services.UsersStore"/>
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.mailet.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -93,13 +93,13 @@
<!-- The User Management block -->
<block name="usermanagement" class="org.apache.james.management.UserManagement" >
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.mailet.UsersRepository"/>
<provide name="users-store" role="org.apache.james.services.UsersStore"/>
</block>
<!-- IMAP Server -->
<block name="imapserver" class="org.apache.james.imapserver.ImapServer" >
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.mailet.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -114,7 +114,7 @@
<!-- POP3 Server -->
<block name="pop3server" class="org.apache.james.pop3server.POP3Server" >
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.mailet.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -128,7 +128,7 @@
<!-- SMTP Server -->
<block name="smtpserver" class="org.apache.james.smtpserver.SMTPServer" >
<provide name="James" role="org.apache.mailet.MailetContext"/>
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.mailet.UsersRepository"/>
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
@@ -146,7 +146,7 @@
<!-- NNTP Server -->
<block name="nntpserver" class="org.apache.james.nntpserver.NNTPServer" >
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.mailet.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -168,7 +168,7 @@
<provide name="scheduler"
role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
<provide name="James" role="org.apache.james.services.MailServer"/>
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.mailet.UsersRepository"/>
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
</block>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java Fri Oct 27 09:14:47 2006
@@ -46,7 +46,6 @@
import org.apache.james.services.MailServer;
import org.apache.james.services.ManageableDomainList;
import org.apache.james.services.SpoolRepository;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.mailet.Mail;
@@ -55,6 +54,7 @@
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetContext;
import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.UsersRepository;
import javax.mail.Address;
import javax.mail.Message;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.xinfo Fri Oct 27 09:14:47 2006
@@ -25,7 +25,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ <service name="org.apache.mailet.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.SpoolRepository" version="1.0"/>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/AvalonUsersStore.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/AvalonUsersStore.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/AvalonUsersStore.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/AvalonUsersStore.java Fri Oct 27 09:14:47 2006
@@ -22,8 +22,8 @@
package org.apache.james.core;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
+import org.apache.mailet.UsersRepository;
import java.util.Iterator;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalJamesUsersRepository.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalJamesUsersRepository.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalJamesUsersRepository.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalJamesUsersRepository.xinfo Fri Oct 27 09:14:47 2006
@@ -9,7 +9,7 @@
<!-- services that are offered by this block -->
<services>
- <service name="org.apache.james.services.UsersRepository" version="1.0" />
+ <service name="org.apache.mailet.UsersRepository" version="1.0" />
<service name="org.apache.james.services.JamesUsersRepository" version="1.0" />
<service name="org.apache.james.services.VirtualUserTable" version="1.0" />
</services>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.java Fri Oct 27 09:14:47 2006
@@ -24,9 +24,9 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.JamesMBean;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import java.util.Iterator;
@@ -63,91 +63,91 @@
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(org.apache.james.services.User)
+ * @see org.apache.mailet.UsersRepository#addUser(org.apache.mailet.User)
*/
public boolean addUser(User user) {
return users.addUser(user);
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.Object)
+ * @see org.apache.mailet.UsersRepository#addUser(java.lang.String, java.lang.Object)
*/
public void addUser(String name, Object attributes) {
users.addUser(name,attributes);
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.mailet.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
return users.addUser(username, password);
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByName(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#getUserByName(java.lang.String)
*/
public User getUserByName(String name) {
return users.getUserByName(name);
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
*/
public User getUserByNameCaseInsensitive(String name) {
return users.getUserByNameCaseInsensitive(name);
}
/**
- * @see org.apache.james.services.UsersRepository#getRealName(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#getRealName(java.lang.String)
*/
public String getRealName(String name) {
return users.getRealName(name);
}
/**
- * @see org.apache.james.services.UsersRepository#updateUser(org.apache.james.services.User)
+ * @see org.apache.mailet.UsersRepository#updateUser(org.apache.mailet.User)
*/
public boolean updateUser(User user) {
return users.updateUser(user);
}
/**
- * @see org.apache.james.services.UsersRepository#removeUser(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#removeUser(java.lang.String)
*/
public void removeUser(String name) {
users.removeUser(name);
}
/**
- * @see org.apache.james.services.UsersRepository#contains(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#contains(java.lang.String)
*/
public boolean contains(String name) {
return users.contains(name);
}
/**
- * @see org.apache.james.services.UsersRepository#containsCaseInsensitive(java.lang.String)
+ * @see org.apache.mailet.UsersRepository#containsCaseInsensitive(java.lang.String)
*/
public boolean containsCaseInsensitive(String name) {
return users.containsCaseInsensitive(name);
}
/**
- * @see org.apache.james.services.UsersRepository#test(java.lang.String, java.lang.String)
+ * @see org.apache.mailet.UsersRepository#test(java.lang.String, java.lang.String)
*/
public boolean test(String name, String password) {
return users.test(name,password);
}
/**
- * @see org.apache.james.services.UsersRepository#countUsers()
+ * @see org.apache.mailet.UsersRepository#countUsers()
*/
public int countUsers() {
return users.countUsers();
}
/**
- * @see org.apache.james.services.UsersRepository#list()
+ * @see org.apache.mailet.UsersRepository#list()
*/
public Iterator list() {
return users.list();
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/core/LocalUsersRepository.xinfo Fri Oct 27 09:14:47 2006
@@ -9,7 +9,7 @@
<!-- services that are offered by this block -->
<services>
- <service name="org.apache.james.services.UsersRepository" version="1.0" />
+ <service name="org.apache.mailet.UsersRepository" version="1.0" />
</services>
<!-- interfaces that may be exported to manange this block -->
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchMail.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchMail.java Fri Oct 27 09:14:47 2006
@@ -42,8 +42,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.DNSServer;
+import org.apache.mailet.UsersRepository;
/**
* <p>Class <code>FetchMail</code> is an Avalon task that is periodically
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo Fri Oct 27 09:14:47 2006
@@ -20,7 +20,7 @@
<service name="org.apache.james.services.MailServer" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ <service name="org.apache.mailet.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.DNSServer" version="1.0"/>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ParsedConfiguration.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ParsedConfiguration.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ParsedConfiguration.java Fri Oct 27 09:14:47 2006
@@ -34,7 +34,7 @@
import org.apache.james.services.DNSServer;
import org.apache.james.services.MailServer;
import org.apache.mailet.MailAddress;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
/**
* <p>Parses and validates an
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ProcessorAbstract.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ProcessorAbstract.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ProcessorAbstract.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/fetchmail/ProcessorAbstract.java Fri Oct 27 09:14:47 2006
@@ -30,7 +30,7 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.james.services.MailServer;
import org.apache.mailet.MailAddress;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
import org.apache.james.services.DNSServer;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandler.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandler.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandler.java Fri Oct 27 09:14:47 2006
@@ -37,10 +37,10 @@
import org.apache.james.Constants;
import org.apache.james.imapserver.debug.CopyInputStream;
import org.apache.james.imapserver.debug.SplitOutputStream;
-import org.apache.james.services.User;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogTarget;
+import org.apache.mailet.User;
/**
* The handler class for IMAP connections.
@@ -245,11 +245,11 @@
//Write BYE message.
if ( getLogger().isInfoEnabled() ) {
- String user = "<unknown>";
- User userObject = session.getUser();
- if (userObject != null) {
- user = userObject.getUserName();
- }
+ String user = "<unknown>";
+ User userObject = session.getUser();
+ if (userObject != null) {
+ user = userObject.getUserName();
+ }
StringBuffer logBuffer =
new StringBuffer( 128 )
.append( "Connection for " )
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java Fri Oct 27 09:14:47 2006
@@ -20,7 +20,7 @@
package org.apache.james.imapserver;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.java Fri Oct 27 09:14:47 2006
@@ -30,9 +30,9 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.UsersRepository;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
+import org.apache.mailet.UsersRepository;
/**
* TODO: this is a quick cut-and-paste hack from POP3Server. Should probably be
@@ -76,7 +76,7 @@
{
super.service( serviceManager );
UsersRepository usersRepository = ( UsersRepository ) serviceManager.
- lookup( "org.apache.james.services.UsersRepository" );
+ lookup( "org.apache.mailet.UsersRepository" );
setUserRepository(usersRepository);
MailboxManagerProvider mailboxManagerProvider =(MailboxManagerProvider) serviceManager.lookup("org.apache.james.mailboxmanager.manager.MailboxManagerProvider");
getLogger().debug("MailboxManagerMailRepository uses service "+mailboxManagerProvider);
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapServer.xinfo Fri Oct 27 09:14:47 2006
@@ -12,7 +12,7 @@
<service name="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ <service name="org.apache.mailet.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSession.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSession.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSession.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSession.java Fri Oct 27 09:14:47 2006
@@ -23,8 +23,8 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
import org.apache.james.mailboxmanager.manager.GeneralManager;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSessionImpl.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSessionImpl.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSessionImpl.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/ImapSessionImpl.java Fri Oct 27 09:14:47 2006
@@ -29,8 +29,8 @@
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
import org.apache.james.mailboxmanager.manager.GeneralManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
/**
* @version $Revision: 109034 $
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/commands/LoginCommand.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/commands/LoginCommand.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/commands/LoginCommand.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/imapserver/commands/LoginCommand.java Fri Oct 27 09:14:47 2006
@@ -23,7 +23,7 @@
import org.apache.james.imapserver.ImapResponse;
import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ProtocolException;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/acl/GroupAwareUser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/acl/GroupAwareUser.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/acl/GroupAwareUser.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/acl/GroupAwareUser.java Fri Oct 27 09:14:47 2006
@@ -1,6 +1,6 @@
package org.apache.james.mailboxmanager.acl;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
public interface GroupAwareUser extends User {
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/BasicManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/BasicManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/BasicManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/BasicManager.java Fri Oct 27 09:14:47 2006
@@ -1,7 +1,7 @@
package org.apache.james.mailboxmanager.manager;
import org.apache.james.mailboxmanager.mailbox.BasicMailboxSession;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
public interface BasicManager {
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/GeneralManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/GeneralManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/GeneralManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/GeneralManager.java Fri Oct 27 09:14:47 2006
@@ -9,7 +9,7 @@
import org.apache.james.mailboxmanager.mailbox.GeneralMailboxSession;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
import org.apache.james.mailboxmanager.mailbox.MailboxSession;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
/**
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java Fri Oct 27 09:14:47 2006
@@ -1,7 +1,7 @@
package org.apache.james.mailboxmanager.manager;
import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
public interface MailboxManagerProvider {
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/QuotaManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/QuotaManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/QuotaManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/manager/QuotaManager.java Fri Oct 27 09:14:47 2006
@@ -2,7 +2,7 @@
import org.apache.james.mailboxmanager.ListResult;
import org.apache.james.mailboxmanager.Quota;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
/**
* manages quota. Only getQuotas() will be used by MailboxRepository to create a
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java Fri Oct 27 09:14:47 2006
@@ -48,9 +48,9 @@
import org.apache.james.mailboxmanager.mailbox.UidMailbox;
import org.apache.james.mailboxmanager.manager.GeneralManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.User;
import org.apache.james.userrepository.DefaultJamesUser;
import org.apache.mailet.Mail;
+import org.apache.mailet.User;
/**
* MailRepository wrapper to a MailboxManager <br />
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java Fri Oct 27 09:14:47 2006
@@ -25,7 +25,7 @@
import org.apache.james.mailboxmanager.tracking.MailboxCache;
import org.apache.james.mailboxmanager.tracking.UidChangeTracker;
import org.apache.james.mailboxmanager.wrapper.ImapMailboxSessionWrapper;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
import org.apache.torque.TorqueException;
import org.apache.torque.util.CountHelper;
import org.apache.torque.util.Criteria;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java Fri Oct 27 09:14:47 2006
@@ -32,8 +32,8 @@
import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
import org.apache.james.mailboxmanager.tracking.MailboxCache;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.User;
import org.apache.james.util.SqlResources;
+import org.apache.mailet.User;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.util.BasePeer;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.java Fri Oct 27 09:14:47 2006
@@ -25,11 +25,13 @@
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.services.UsersRepository;
-import org.apache.james.services.User;
import org.apache.james.services.JamesUser;
import org.apache.james.services.UsersStore;
+import org.apache.mailet.AliasedUser;
+import org.apache.mailet.ForwardingUser;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import javax.mail.internet.ParseException;
import java.util.Iterator;
@@ -129,7 +131,7 @@
public boolean setAlias(String userName, String aliasUserName, String repositoryName) throws UserManagementException {
JamesUser user = getJamesUser(userName, null);
- JamesUser aliasUser = getJamesUser(aliasUserName, null);
+ ForwardingUser aliasUser = getJamesUser(aliasUserName, null);
if (aliasUser == null) return false;
boolean success = user.setAlias(aliasUserName);
@@ -148,7 +150,7 @@
}
public String getAlias(String userName, String repositoryName) throws UserManagementException {
- JamesUser user = getJamesUser(userName, null);
+ AliasedUser user = getJamesUser(userName, null);
if (!user.getAliasing()) return null;
return user.getAlias();
}
@@ -181,7 +183,7 @@
}
public String getForwardAddress(String userName, String repositoryName) throws UserManagementException {
- JamesUser user = getJamesUser(userName, null);
+ ForwardingUser user = getJamesUser(userName, null);
if (!user.getForwarding()) return null;
return user.getForwardingDestination().toString();
}
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/management/UserManagement.xinfo Fri Oct 27 09:14:47 2006
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ <service name="org.apache.mailet.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.UsersStore" version="1.0"/>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java Fri Oct 27 09:14:47 2006
@@ -22,7 +22,7 @@
package org.apache.james.nntpserver;
import org.apache.james.nntpserver.repository.NNTPRepository;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
/**
* Provides a number of server-wide constant values to the
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.java Fri Oct 27 09:14:47 2006
@@ -27,7 +27,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.nntpserver.repository.NNTPRepository;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
/**
* NNTP Server
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/nntpserver/NNTPServer.xinfo Fri Oct 27 09:14:47 2006
@@ -23,7 +23,7 @@
<service name="org.apache.james.nntpserver.repository.NNTPRepository" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ <service name="org.apache.mailet.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java Fri Oct 27 09:14:47 2006
@@ -22,7 +22,7 @@
package org.apache.james.pop3server;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
/**
* Provides a number of server-wide constant values to the
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.java Fri Oct 27 09:14:47 2006
@@ -28,7 +28,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
/**
* <p>Accepts POP3 connections on a server socket and dispatches them to POP3Handlers.</p>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Server.xinfo Fri Oct 27 09:14:47 2006
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ <service name="org.apache.mailet.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.java Fri Oct 27 09:14:47 2006
@@ -30,8 +30,8 @@
import org.apache.james.services.BayesianAnalyzerManagementService;
import org.apache.james.services.MailServer;
import org.apache.james.services.SpoolManagementService;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
+import org.apache.mailet.UsersRepository;
import java.util.HashMap;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManager.xinfo Fri Oct 27 09:14:47 2006
@@ -17,7 +17,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ <service name="org.apache.mailet.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java Fri Oct 27 09:14:47 2006
@@ -35,9 +35,11 @@
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.SpoolFilter;
import org.apache.james.services.JamesUser;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.AliasedUser;
+import org.apache.mailet.ForwardingUser;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
/**
@@ -664,7 +666,7 @@
}
JamesUser user = (JamesUser) baseuser;
- JamesUser aliasUser = (JamesUser) users.getUserByName(alias);
+ ForwardingUser aliasUser = (ForwardingUser) users.getUserByName(alias);
if (aliasUser == null) {
writeLoggedFlushedResponse("Alias unknown to server - create that user first.");
return true;
@@ -774,7 +776,7 @@
return true;
}
- JamesUser user = (JamesUser)baseuser;
+ AliasedUser user = (AliasedUser)baseuser;
if ( user == null ) {
writeLoggedFlushedResponse("No such user " + username);
return true;
@@ -819,7 +821,7 @@
writeLoggedFlushedResponse("Can't set forwarding for this user type.");
return true;
}
- JamesUser user = (JamesUser)baseuser;
+ ForwardingUser user = (ForwardingUser)baseuser;
if ( user == null ) {
writeLoggedFlushedResponse("No such user " + username);
return true;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java Fri Oct 27 09:14:47 2006
@@ -25,8 +25,8 @@
import org.apache.james.services.BayesianAnalyzerManagementService;
import org.apache.james.services.MailServer;
import org.apache.james.services.SpoolManagementService;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
+import org.apache.mailet.UsersRepository;
import java.util.HashMap;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUser.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUser.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUser.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUser.java Fri Oct 27 09:14:47 2006
@@ -21,7 +21,10 @@
package org.apache.james.services;
-import org.apache.mailet.MailAddress;
+import org.apache.mailet.AliasedUser;
+import org.apache.mailet.ForwardingUser;
+import org.apache.mailet.User;
+
/**
* Interface for objects representing users of an email/ messaging system.
@@ -30,64 +33,7 @@
* @version $Revision$
*/
-public interface JamesUser extends User {
-
- /**
- * Change password to pass. Return true if successful.
- *
- * @param pass the new password
- * @return true if successful, false otherwise
- */
- boolean setPassword(String pass);
-
- /**
- * Indicate if mail for this user should be forwarded to some other mail
- * server.
- *
- * @param forward whether email for this user should be forwarded
- */
- void setForwarding(boolean forward);
-
- /**
- * Return true if mail for this user should be forwarded
- */
- boolean getForwarding();
-
- /**
- * <p>Set destination for forwading mail</p>
- * <p>TODO: Should we use a MailAddress?</p>
- *
- * @param address the forwarding address for this user
- */
- boolean setForwardingDestination(MailAddress address);
-
- /**
- * Return the destination to which email should be forwarded
- */
- MailAddress getForwardingDestination();
-
- /**
- * Indicate if mail received for this user should be delivered locally to
- * a different address.
- */
- void setAliasing(boolean alias);
-
- /**
- * Return true if emails should be delivered locally to an alias.
- */
- boolean getAliasing();
-
- /**
- * Set local address to which email should be delivered.
- *
- * @return true if successful
- */
- boolean setAlias(String address);
-
- /**
- * Get local address to which mail should be delivered.
- */
- String getAlias();
+public interface JamesUser extends User, ForwardingUser, AliasedUser {
}
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUsersRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUsersRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/JamesUsersRepository.java Fri Oct 27 09:14:47 2006
@@ -19,6 +19,8 @@
package org.apache.james.services;
+import org.apache.mailet.UsersRepository;
+
public interface JamesUsersRepository extends UsersRepository, VirtualUserTable {
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/UsersStore.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/UsersStore.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/UsersStore.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/UsersStore.java Fri Oct 27 09:14:47 2006
@@ -22,6 +22,7 @@
package org.apache.james.services;
import java.util.Iterator;
+import org.apache.mailet.UsersRepository;
/**
* Interface for Phoenix blocks to access a store of Users. A UserStore
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java Fri Oct 27 09:14:47 2006
@@ -22,7 +22,7 @@
package org.apache.james.smtpserver;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.UsersRepository;
/**
* Provides a number of server-wide constant values to the
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.java Fri Oct 27 09:14:47 2006
@@ -30,9 +30,9 @@
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.DNSServer;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.util.NetMatcher;
import org.apache.mailet.MailetContext;
+import org.apache.mailet.UsersRepository;
/**
* <p>Accepts SMTP connections on a server socket and dispatches them to SMTPHandlers.</p>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.xinfo?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.xinfo (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/smtpserver/SMTPServer.xinfo Fri Oct 27 09:14:47 2006
@@ -17,7 +17,7 @@
<service name="org.apache.mailet.MailetContext" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ <service name="org.apache.mailet.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.DNSServer" version="1.0"/>
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListserv.java Fri Oct 27 09:14:47 2006
@@ -24,9 +24,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import javax.mail.internet.ParseException;
import java.util.Collection;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListservManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListservManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListservManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/AvalonListservManager.java Fri Oct 27 09:14:47 2006
@@ -24,9 +24,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
/**
* Adds or removes an email address to a listserv.
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservManager.java Fri Oct 27 09:14:47 2006
@@ -25,7 +25,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.james.Constants;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.transport.mailets.listservcommands.ErrorCommand;
import org.apache.james.transport.mailets.listservcommands.IListServCommand;
@@ -33,6 +32,7 @@
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import java.io.File;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java Fri Oct 27 09:14:47 2006
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.james.Constants;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.mailet.RFC2822Headers;
import org.apache.james.util.XMLResources;
@@ -33,6 +32,7 @@
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ICommandListservManager.java Fri Oct 27 09:14:47 2006
@@ -22,11 +22,11 @@
package org.apache.james.transport.mailets;
import org.apache.james.transport.mailets.listservcommands.IListServCommand;
-import org.apache.james.services.UsersRepository;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import org.apache.avalon.framework.configuration.ConfigurationException;
import javax.mail.MessagingException;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Fri Oct 27 09:14:47 2006
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.services.VirtualUserTable;
import org.apache.james.vut.ErrorMappingException;
@@ -32,6 +31,7 @@
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/WhiteListManager.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/WhiteListManager.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/WhiteListManager.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/WhiteListManager.java Fri Oct 27 09:14:47 2006
@@ -25,14 +25,14 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.JamesUser;
-import org.apache.james.services.UsersRepository;
import org.apache.james.util.JDBCUtil;
import org.apache.james.util.SqlResources;
+import org.apache.mailet.AliasedUser;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.UsersRepository;
import org.apache.mailet.dates.RFC822DateFormat;
import javax.mail.Message;
@@ -749,7 +749,7 @@
String username;
try {
username = localusers.getRealName(originalUsername);
- JamesUser user = (JamesUser) localusers.getUserByName(username);
+ AliasedUser user = (AliasedUser) localusers.getUserByName(username);
if (user.getAliasing()) {
username = user.getAlias();
}
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java Fri Oct 27 09:14:47 2006
@@ -23,13 +23,13 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.mailet.RFC2822Headers;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
+import org.apache.mailet.UsersRepository;
import javax.activation.DataHandler;
import javax.mail.Message;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Info.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Info.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Info.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Info.java Fri Oct 27 09:14:47 2006
@@ -23,10 +23,10 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import java.util.Iterator;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java Fri Oct 27 09:14:47 2006
@@ -23,11 +23,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import java.util.Properties;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java Fri Oct 27 09:14:47 2006
@@ -25,9 +25,9 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
-import org.apache.james.services.UsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import java.util.Properties;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java Fri Oct 27 09:14:47 2006
@@ -23,11 +23,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import java.util.Properties;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java Fri Oct 27 09:14:47 2006
@@ -25,9 +25,9 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
-import org.apache.james.services.UsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import java.util.Properties;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java Fri Oct 27 09:14:47 2006
@@ -25,13 +25,13 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.JamesUser;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.AliasedUser;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailRepository;
import org.apache.mailet.MailetContext;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
@@ -122,7 +122,7 @@
String username;
try {
username = localusers.getRealName(originalUsername);
- JamesUser user = (JamesUser) localusers.getUserByName(username);
+ AliasedUser user = (AliasedUser) localusers.getUserByName(username);
if (user.getAliasing()) {
username = user.getAlias();
}
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/IsInWhiteList.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/IsInWhiteList.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/IsInWhiteList.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/IsInWhiteList.java Fri Oct 27 09:14:47 2006
@@ -25,14 +25,14 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.JamesUser;
-import org.apache.james.services.UsersRepository;
import org.apache.james.transport.mailets.WhiteListManager;
import org.apache.james.util.JDBCUtil;
import org.apache.james.util.SqlResources;
+import org.apache.mailet.AliasedUser;
import org.apache.mailet.GenericMatcher;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
@@ -232,7 +232,7 @@
String username;
try {
username = localusers.getRealName(originalUsername);
- JamesUser user = (JamesUser) localusers.getUserByName(username);
+ AliasedUser user = (AliasedUser) localusers.getUserByName(username);
if (user.getAliasing()) {
username = user.getAlias();
}
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Fri Oct 27 09:14:47 2006
@@ -29,9 +29,9 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.User;
import org.apache.james.util.JDBCUtil;
import org.apache.james.util.SqlResources;
+import org.apache.mailet.User;
import java.io.File;
import java.sql.Connection;
Modified: james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractUsersRepository.java?view=diff&rev=468439&r1=468438&r2=468439
==============================================================================
--- james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractUsersRepository.java (original)
+++ james/server/sandbox/mailet-refactorings/src/java/org/apache/james/userrepository/AbstractUsersRepository.java Fri Oct 27 09:14:47 2006
@@ -25,10 +25,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.services.JamesUser;
import org.apache.james.services.JamesUsersRepository;
-import org.apache.james.services.User;
import org.apache.james.vut.ErrorMappingException;
+import org.apache.mailet.AliasedUser;
+import org.apache.mailet.ForwardingUser;
+import org.apache.mailet.User;
import java.util.ArrayList;
import java.util.Collection;
@@ -158,8 +159,8 @@
Collection mappings = new ArrayList();
User user = getUserByName(username);
- if (user instanceof JamesUser) {
- JamesUser jUser = (JamesUser) user;
+ if (user instanceof AliasedUser) {
+ AliasedUser jUser = (AliasedUser) user;
if (enableAliases && jUser.getAliasing()) {
String alias = jUser.getAlias();
@@ -167,11 +168,15 @@
mappings.add(alias + "@" + domain);
}
}
-
- if (enableForwarding && jUser.getForwarding()) {
+ }
+ if(user instanceof ForwardingUser){
+ ForwardingUser fUser = (ForwardingUser) user;
+
+
+ if (enableForwarding && fUser.getForwarding()) {
String forward = null;
- if (jUser.getForwardingDestination() != null
- && ((forward = jUser.getForwardingDestination()
+ if (fUser.getForwardingDestination() != null
+ && ((forward = fUser.getForwardingDestination()
.toString()) != null)) {
mappings.add(forward);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org