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 ba...@apache.org on 2008/08/10 13:42:13 UTC
svn commit: r684466 [1/2] - in /james/server/trunk:
avalon-user-function/src/main/java/org/apache/james/core/
avalon-user-function/src/main/java/org/apache/james/userrepository/
avalon-user-function/src/main/resources/org/apache/james/core/ avalon-user...
Author: bago
Date: Sun Aug 10 04:42:08 2008
New Revision: 684466
URL: http://svn.apache.org/viewvc?rev=684466&view=rev
Log:
Repackaging for the user api code, in progress.
moved services interfaces to user.api and management interfaces to user.api.management
Added:
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/User.java (contents, props changed)
- copied, changed from r684462, james/server/trunk/user-api/src/main/java/org/apache/james/services/User.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java (contents, props changed)
- copied, changed from r684462, james/server/trunk/user-api/src/main/java/org/apache/james/services/UsersRepository.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java (contents, props changed)
- copied, changed from r684462, james/server/trunk/user-api/src/main/java/org/apache/james/services/UsersStore.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/UserManagementException.java (contents, props changed)
- copied, changed from r684462, james/server/trunk/user-api/src/main/java/org/apache/james/management/UserManagementException.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/UserManagementMBean.java (contents, props changed)
- copied, changed from r684462, james/server/trunk/user-api/src/main/java/org/apache/james/management/UserManagementMBean.java
Removed:
james/server/trunk/user-api/src/main/java/org/apache/james/management/UserManagementException.java
james/server/trunk/user-api/src/main/java/org/apache/james/management/UserManagementMBean.java
james/server/trunk/user-api/src/main/java/org/apache/james/services/User.java
james/server/trunk/user-api/src/main/java/org/apache/james/services/UsersRepository.java
james/server/trunk/user-api/src/main/java/org/apache/james/services/UsersStore.java
Modified:
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonUsersStore.xinfo
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
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/ListUsersJdbcRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/Imap4Rev1ProcessorFactory.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ListProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java
james/server/trunk/imap-mailbox-processor-function/src/test/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessorTest.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSession.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/LoginCommand.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.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/mailets/listservcommands/BaseCommand.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.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/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo
james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.java
james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.xinfo
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalHostSystem.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/commands/AbstractCommandTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MockUser.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MockUsersRepository.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/MockUser.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.xinfo
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
james/server/trunk/user-library/src/main/java/org/apache/james/core/LocalUsersRepository.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/services/JamesUser.java
james/server/trunk/user-library/src/main/java/org/apache/james/services/JamesUsersRepository.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/DefaultUser.java
james/server/trunk/user-library/src/main/resources/org/apache/james/core/LocalJamesUsersRepository.xinfo
james/server/trunk/user-library/src/main/resources/org/apache/james/core/LocalUsersRepository.xinfo
james/server/trunk/user-library/src/main/resources/org/apache/james/management/UserManagement.xinfo
james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockUsersStore.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java Sun Aug 10 04:42:08 2008
@@ -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.james.api.user.UsersRepository;
+import org.apache.james.api.user.UsersStore;
import java.util.Iterator;
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Sun Aug 10 04:42:08 2008
@@ -28,8 +28,8 @@
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.User;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.User;
import org.apache.james.util.JDBCUtil;
import org.apache.james.util.SqlResources;
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java Sun Aug 10 04:42:08 2008
@@ -21,7 +21,7 @@
package org.apache.james.userrepository;
-import org.apache.james.services.User;
+import org.apache.james.api.user.User;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -55,7 +55,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.services.User, java.sql.PreparedStatement)
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.api.user.User, java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
PreparedStatement userInsert)
@@ -68,7 +68,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.services.User, java.sql.PreparedStatement)
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.api.user.User, java.sql.PreparedStatement)
*/
protected void setUserForUpdateStatement(User user,
PreparedStatement userUpdate)
@@ -81,7 +81,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
User newbie = new DefaultUser(username, "SHA");
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java Sun Aug 10 04:42:08 2008
@@ -21,7 +21,7 @@
package org.apache.james.userrepository;
-import org.apache.james.services.User;
+import org.apache.james.api.user.User;
import org.apache.mailet.MailAddress;
import java.sql.PreparedStatement;
@@ -72,7 +72,7 @@
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.services.User,
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.api.user.User,
* java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
@@ -81,7 +81,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.services.User,
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForUpdateStatement(org.apache.james.api.user.User,
* java.sql.PreparedStatement)
*/
protected void setUserForUpdateStatement(User user,
@@ -145,7 +145,7 @@
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String,
+ * @see org.apache.james.api.user.UsersRepository#addUser(java.lang.String,
* java.lang.String)
*/
public boolean addUser(String username, String password) {
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/ListUsersJdbcRepository.java Sun Aug 10 04:42:08 2008
@@ -21,7 +21,7 @@
package org.apache.james.userrepository;
-import org.apache.james.services.User;
+import org.apache.james.api.user.User;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -56,7 +56,7 @@
}
/**
- * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.services.User, java.sql.PreparedStatement)
+ * @see org.apache.james.userrepository.AbstractJdbcUsersRepository#setUserForInsertStatement(org.apache.james.api.user.User, java.sql.PreparedStatement)
*/
protected void setUserForInsertStatement(User user,
PreparedStatement userInsert)
@@ -82,7 +82,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
User newbie = new DefaultUser(username, "SHA");
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java Sun Aug 10 04:42:08 2008
@@ -31,7 +31,7 @@
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.User;
+import org.apache.james.api.user.User;
import org.apache.james.userrepository.AbstractUsersRepository;
import org.apache.james.userrepository.DefaultJamesUser;
@@ -140,14 +140,14 @@
}
/**
- * @see org.apache.james.services.UsersRepository#list()
+ * @see org.apache.james.api.user.UsersRepository#list()
*/
public Iterator list() {
return objectRepository.list();
}
/**
- * @see org.apache.james.userrepository.AbstractUsersRepository#doAddUser(org.apache.james.services.User)
+ * @see org.apache.james.userrepository.AbstractUsersRepository#doAddUser(org.apache.james.api.user.User)
*/
protected void doAddUser(User user) {
try {
@@ -158,7 +158,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
User newbie = new DefaultJamesUser(username, "SHA");
@@ -167,7 +167,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByName(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#getUserByName(java.lang.String)
*/
public synchronized User getUserByName(String name) {
if (ignoreCase) {
@@ -189,7 +189,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
*/
public User getUserByNameCaseInsensitive(String name) {
String realName = getRealName(name, true);
@@ -218,14 +218,14 @@
}
/**
- * @see org.apache.james.services.UsersRepository#getRealName(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#getRealName(java.lang.String)
*/
public String getRealName(String name) {
return getRealName(name, ignoreCase);
}
/**
- * @see org.apache.james.userrepository.AbstractUsersRepository#doUpdateUser(org.apache.james.services.User)
+ * @see org.apache.james.userrepository.AbstractUsersRepository#doUpdateUser(org.apache.james.api.user.User)
*/
public void doUpdateUser(User user) {
try {
@@ -237,14 +237,14 @@
}
/**
- * @see org.apache.james.services.UsersRepository#removeUser(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#removeUser(java.lang.String)
*/
public synchronized void removeUser(String name) {
objectRepository.remove(name);
}
/**
- * @see org.apache.james.services.UsersRepository#contains(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#contains(java.lang.String)
*/
public boolean contains(String name) {
if (ignoreCase) {
@@ -255,7 +255,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#containsCaseInsensitive(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#containsCaseInsensitive(java.lang.String)
*/
public boolean containsCaseInsensitive(String name) {
Iterator it = list();
@@ -268,7 +268,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#test(java.lang.String, java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#test(java.lang.String, java.lang.String)
*/
public boolean test(String name, String password) {
User user;
@@ -282,7 +282,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#countUsers()
+ * @see org.apache.james.api.user.UsersRepository#countUsers()
*/
public int countUsers() {
int count = 0;
Modified: james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonUsersStore.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonUsersStore.xinfo?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonUsersStore.xinfo (original)
+++ james/server/trunk/avalon-user-function/src/main/resources/org/apache/james/core/AvalonUsersStore.xinfo Sun Aug 10 04:42:08 2008
@@ -27,7 +27,7 @@
<!-- services that are offered by this block -->
<services>
- <service name="org.apache.james.services.UsersStore" version="1.0" />
+ <service name="org.apache.james.api.user.UsersStore" version="1.0" />
</services>
<dependencies>
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java Sun Aug 10 04:42:08 2008
@@ -23,8 +23,9 @@
import junit.framework.TestCase;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.james.services.UsersRepository;
-import org.apache.james.services.UsersStore;
+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.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.james.MockUsersStore;
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java Sun Aug 10 04:42:08 2008
@@ -24,7 +24,7 @@
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.services.UsersRepository;
+import org.apache.james.api.user.UsersRepository;
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/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?rev=684466&r1=684465&r2=684466&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:42:08 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.UsersRepository;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.services.JamesUser;
-import org.apache.james.services.UsersRepository;
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/ListUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java Sun Aug 10 04:42:08 2008
@@ -23,7 +23,7 @@
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.services.UsersRepository;
+import org.apache.james.api.user.UsersRepository;
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=684466&r1=684465&r2=684466&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:42:08 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.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.services.UsersRepository;
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/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java (original)
+++ james/server/trunk/basic-user-function/src/main/java/org/apache/james/userrepository/UsersLDAPRepository.java Sun Aug 10 04:42:08 2008
@@ -25,7 +25,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.User;
+import org.apache.james.api.user.User;
import org.apache.james.userrepository.AbstractUsersRepository;
import org.apache.james.userrepository.DefaultUser;
@@ -237,28 +237,28 @@
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByName(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#getUserByName(java.lang.String)
*/
public User getUserByName(String name) {
return new DefaultUser("dummy", "dummy");
}
/**
- * @see org.apache.james.services.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#getUserByNameCaseInsensitive(java.lang.String)
*/
public User getUserByNameCaseInsensitive(String name) {
return getUserByName(name);
}
/**
- * @see org.apache.james.services.UsersRepository#containsCaseInsensitive(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#containsCaseInsensitive(java.lang.String)
*/
public boolean containsCaseInsensitive(String name) {
return getUsers().contains(name);
}
/**
- * @see org.apache.james.services.UsersRepository#getRealName(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#getRealName(java.lang.String)
*/
public String getRealName(String name) {
return getRealName(name, ignoreCase);
@@ -285,14 +285,14 @@
}
/**
- * @see org.apache.james.services.UsersRepository#updateUser(org.apache.james.services.User)
+ * @see org.apache.james.api.user.UsersRepository#updateUser(org.apache.james.api.user.User)
*/
public boolean updateUser(User user) {
return false;
}
/**
- * @see org.apache.james.services.UsersRepository#addUser(java.lang.String, java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public boolean addUser(String username, String password) {
if (!contains(username)) {
@@ -374,7 +374,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#removeUser(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#removeUser(java.lang.String)
*/
public synchronized void removeUser(String userName) {
String[] attrIDs = {membersAttr};
@@ -516,7 +516,7 @@
/**
- * @see org.apache.james.services.UsersRepository#contains(java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#contains(java.lang.String)
*/
public boolean contains(String name) {
boolean found = false;
@@ -548,7 +548,7 @@
/**
- * @see org.apache.james.services.UsersRepository#test(java.lang.String, java.lang.String)
+ * @see org.apache.james.api.user.UsersRepository#test(java.lang.String, java.lang.String)
*/
public boolean test(String name, String testPassword) {
boolean result = false;
@@ -651,7 +651,7 @@
}
/**
- * @see org.apache.james.services.UsersRepository#countUsers()
+ * @see org.apache.james.api.user.UsersRepository#countUsers()
*/
public int countUsers() {
return getUsers().size();
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java Sun Aug 10 04:42:08 2008
@@ -21,10 +21,10 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java Sun Aug 10 04:42:08 2008
@@ -41,8 +41,8 @@
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.UsersRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.DNSServer;
/**
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.xinfo Sun Aug 10 04:42:08 2008
@@ -37,7 +37,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.james.api.user.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.DNSServer" version="1.0"/>
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java Sun Aug 10 04:42:08 2008
@@ -31,10 +31,10 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.services.DNSServer;
import org.apache.james.services.MailServer;
import org.apache.mailet.MailAddress;
-import org.apache.james.services.UsersRepository;
/**
* <p>Parses and validates an
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java Sun Aug 10 04:42:08 2008
@@ -28,9 +28,9 @@
import javax.mail.Session;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.services.MailServer;
import org.apache.mailet.MailAddress;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.DNSServer;
/**
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java Sun Aug 10 04:42:08 2008
@@ -21,11 +21,11 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.api.user.User;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.User;
abstract public class AbstractMailboxAwareProcessor extends AbstractImapRequestProcessor {
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/ImapSessionUtils.java Sun Aug 10 04:42:08 2008
@@ -25,10 +25,10 @@
import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.process.ImapSession;
import org.apache.james.api.imap.process.ImapProcessor.Responder;
+import org.apache.james.api.user.User;
import org.apache.james.imap.message.response.base.AbstractImapResponse;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.james.services.User;
public class ImapSessionUtils {
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/Imap4Rev1ProcessorFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/Imap4Rev1ProcessorFactory.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/Imap4Rev1ProcessorFactory.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/Imap4Rev1ProcessorFactory.java Sun Aug 10 04:42:08 2008
@@ -21,9 +21,9 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.imapserver.processor.imap4rev1.fetch.FetchProcessor;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.UsersRepository;
/**
* TODO: perhaps this should be a POJO
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java Sun Aug 10 04:42:08 2008
@@ -31,13 +31,13 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.api.user.User;
import org.apache.james.imap.message.request.imap4rev1.LsubRequest;
import org.apache.james.imap.message.response.imap4rev1.server.LSubResponse;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.mailboxmanager.manager.MailboxExpression;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.User;
public class LSubProcessor extends AbstractMailboxAwareProcessor {
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ListProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ListProcessor.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ListProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ListProcessor.java Sun Aug 10 04:42:08 2008
@@ -27,6 +27,7 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.api.user.User;
import org.apache.james.imap.message.request.imap4rev1.ListRequest;
import org.apache.james.imap.message.response.imap4rev1.server.ListResponse;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
@@ -37,7 +38,6 @@
import org.apache.james.mailboxmanager.manager.MailboxExpression;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.User;
public class ListProcessor extends AbstractMailboxAwareProcessor {
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java Sun Aug 10 04:42:08 2008
@@ -26,11 +26,11 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.api.user.User;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.imap.message.request.imap4rev1.LoginRequest;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
/**
* Processes a <code>LOGIN</code> command.
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java Sun Aug 10 04:42:08 2008
@@ -26,10 +26,10 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.api.user.User;
import org.apache.james.imap.message.request.imap4rev1.SubscribeRequest;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
-import org.apache.james.services.User;
public class SubscribeProcessor extends AbstractImapRequestProcessor {
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java Sun Aug 10 04:42:08 2008
@@ -26,10 +26,10 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.api.user.User;
import org.apache.james.imap.message.request.imap4rev1.UnsubscribeRequest;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
-import org.apache.james.services.User;
public class UnsubscribeProcessor extends AbstractImapRequestProcessor {
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java Sun Aug 10 04:42:08 2008
@@ -23,6 +23,7 @@
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapProcessorFactory;
import org.apache.james.api.user.UserMetaDataRespository;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.imap.message.response.imap4rev1.status.UnpooledStatusResponseFactory;
import org.apache.james.imapserver.processor.base.ImapResponseMessageProcessor;
import org.apache.james.imapserver.processor.base.UnknownRequestImapProcessor;
@@ -30,7 +31,6 @@
import org.apache.james.imapserver.processor.imap4rev1.Imap4Rev1ProcessorFactory;
import org.apache.james.imapserver.processor.imap4rev1.UserMetaDataIMAPSubscriber;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.UsersRepository;
/**
*
Modified: james/server/trunk/imap-mailbox-processor-function/src/test/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/test/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessorTest.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/test/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessorTest.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/test/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessorTest.java Sun Aug 10 04:42:08 2008
@@ -29,12 +29,12 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.api.user.User;
import org.apache.james.imap.message.request.imap4rev1.LsubRequest;
import org.apache.james.imap.message.response.imap4rev1.server.LSubResponse;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.mailboxmanager.ListResult;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.User;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandlerConfigurationData.java Sun Aug 10 04:42:08 2008
@@ -19,8 +19,8 @@
package org.apache.james.imapserver;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.UsersRepository;
/**
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java Sun Aug 10 04:42:08 2008
@@ -24,10 +24,10 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
/**
* TODO: this is a quick cut-and-paste hack from POP3Server. Should probably be
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo Sun Aug 10 04:42:08 2008
@@ -29,7 +29,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.james.api.user.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSession.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSession.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSession.java Sun Aug 10 04:42:08 2008
@@ -21,13 +21,13 @@
import java.util.Collection;
+import org.apache.james.api.user.User;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
/**
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java Sun Aug 10 04:42:08 2008
@@ -27,6 +27,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.api.imap.message.MessageFlags;
+import org.apache.james.api.user.User;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
@@ -34,8 +36,6 @@
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
/**
* @version $Revision: 109034 $
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/LoginCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/LoginCommand.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/LoginCommand.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/LoginCommand.java Sun Aug 10 04:42:08 2008
@@ -19,11 +19,11 @@
package org.apache.james.imapserver.commands;
+import org.apache.james.api.user.User;
import org.apache.james.imapserver.ImapRequestLineReader;
import org.apache.james.imapserver.ImapResponse;
import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ProtocolException;
-import org.apache.james.services.User;
/**
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java Sun Aug 10 04:42:08 2008
@@ -24,8 +24,8 @@
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.api.user.UsersRepository;
+import org.apache.james.api.user.UsersStore;
import org.apache.mailet.MailAddress;
import javax.mail.internet.ParseException;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java Sun Aug 10 04:42:08 2008
@@ -24,8 +24,8 @@
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.api.user.UsersRepository;
+import org.apache.james.api.user.UsersStore;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java Sun Aug 10 04:42:08 2008
@@ -25,8 +25,8 @@
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.api.user.UsersRepository;
+import org.apache.james.api.user.UsersStore;
import org.apache.james.transport.mailets.listservcommands.ErrorCommand;
import org.apache.james.transport.mailets.listservcommands.IListServCommand;
import org.apache.james.util.XMLResources;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java Sun Aug 10 04:42:08 2008
@@ -24,8 +24,8 @@
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.james.api.user.UsersRepository;
+import org.apache.james.api.user.UsersStore;
import org.apache.mailet.RFC2822Headers;
import org.apache.james.util.XMLResources;
import org.apache.james.util.mailet.MailetUtil;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java Sun Aug 10 04:42:08 2008
@@ -22,7 +22,7 @@
package org.apache.james.transport.mailets;
import org.apache.james.transport.mailets.listservcommands.IListServCommand;
-import org.apache.james.services.UsersRepository;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mailet;
import org.apache.mailet.Mail;
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=684466&r1=684465&r2=684466&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:42:08 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.UsersRepository;
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.GenericMailet;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java Sun Aug 10 04:42:08 2008
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.UsersRepository;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.mailet.RFC2822Headers;
import org.apache.james.util.XMLResources;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java Sun Aug 10 04:42:08 2008
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.UsersRepository;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java Sun Aug 10 04:42:08 2008
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.UsersRepository;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java Sun Aug 10 04:42:08 2008
@@ -25,7 +25,7 @@
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.james.api.user.UsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java Sun Aug 10 04:42:08 2008
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.services.UsersRepository;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java Sun Aug 10 04:42:08 2008
@@ -25,7 +25,7 @@
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.james.api.user.UsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
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=684466&r1=684465&r2=684466&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:42:08 2008
@@ -25,10 +25,10 @@
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.UsersRepository;
import org.apache.james.services.JamesUser;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
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=684466&r1=684465&r2=684466&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:42:08 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.UsersRepository;
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;
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java Sun Aug 10 04:42:08 2008
@@ -21,8 +21,8 @@
package org.apache.james.nntpserver;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.nntpserver.repository.NNTPRepository;
-import org.apache.james.services.UsersRepository;
/**
* Provides a number of server-wide constant values to the
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java Sun Aug 10 04:42:08 2008
@@ -25,10 +25,10 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.nntpserver.repository.NNTPRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
/**
* NNTP Server
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo Sun Aug 10 04:42:08 2008
@@ -40,7 +40,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.james.api.user.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Sun Aug 10 04:42:08 2008
@@ -43,8 +43,8 @@
here must match the names specified for a Block in this xml file. -->
<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="users-store" role="org.apache.james.api.user.UsersStore"/>
+ <provide name="localusersrepository" role="org.apache.james.api.user.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" />
@@ -99,8 +99,8 @@
<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="users-store" role="org.apache.james.api.user.UsersStore"/>
+ <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -120,8 +120,8 @@
<!-- The User Management block -->
<block name="usermanagement" class="org.apache.james.management.UserManagement" >
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
- <provide name="users-store" role="org.apache.james.services.UsersStore"/>
+ <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
+ <provide name="users-store" role="org.apache.james.api.user.UsersStore"/>
</block>
<!-- IMAP Server -->
@@ -132,7 +132,7 @@
</block>
<block name="imapserver" class="org.apache.james.imapserver.ImapServer" >
- <provide name="localusersrepository" role="org.apache.james.services.UsersRepository"/>
+ <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="imap-connections"
@@ -147,7 +147,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.james.api.user.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -161,7 +161,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.james.api.user.UsersRepository"/>
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
@@ -179,7 +179,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.james.api.user.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -202,7 +202,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.james.api.user.UsersRepository"/>
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
</block>
@@ -244,7 +244,7 @@
<!-- could be safely used -->
<block name="localusersrepository" class="org.apache.james.core.LocalJamesUsersRepository">
<provide name="users-store"
- role="org.apache.james.services.UsersStore"/>
+ role="org.apache.james.api.user.UsersStore"/>
</block>
<!-- The context FileSystem implementation -->
Modified: james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.java?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.java (original)
+++ james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.java Sun Aug 10 04:42:08 2008
@@ -23,9 +23,9 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.api.user.UserMetaDataRespository;
+import org.apache.james.api.user.UsersRepository;
import org.apache.james.imapserver.processor.main.DefaultImapProcessorFactory;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.services.UsersRepository;
public class PhoenixImapProcessorFactory extends DefaultImapProcessorFactory implements Serviceable {
Modified: james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.xinfo?rev=684466&r1=684465&r2=684466&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.xinfo (original)
+++ james/server/trunk/phoenix-deployment/src/java/org/apache/james/imapserver/phoenix/PhoenixImapProcessorFactory.xinfo Sun Aug 10 04:42:08 2008
@@ -32,7 +32,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.james.api.user.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.api.user.UserMetaDataRespository" version="1.0"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org