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 2003/01/06 16:53:02 UTC
cvs commit: jakarta-james/src/java/org/apache/james/userrepository AbstractJdbcUsersRepository.java AbstractUsersRepository.java DefaultUser.java DefaultUsersJdbcRepository.java JamesUsersJdbcRepository.java ListUsersJdbcRepository.java UsersFileRepository.java UsersLDAPRepository.java
danny 2003/01/06 07:53:02
Modified: src/java/org/apache/james/core AvalonUsersStore.java
src/java/org/apache/james/nntpserver NNTPHandler.java
NNTPHandlerConfigurationData.java NNTPServer.java
src/java/org/apache/james/pop3server POP3Handler.java
POP3HandlerConfigurationData.java POP3Server.java
src/java/org/apache/james/remotemanager RemoteManager.java
RemoteManagerHandler.java
RemoteManagerHandlerConfigurationData.java
src/java/org/apache/james/services JamesUser.java
MailStore.java UsersStore.java
src/java/org/apache/james/smtpserver SMTPHandler.java
SMTPHandlerConfigurationData.java SMTPServer.java
src/java/org/apache/james/userrepository
AbstractJdbcUsersRepository.java
AbstractUsersRepository.java DefaultUser.java
DefaultUsersJdbcRepository.java
JamesUsersJdbcRepository.java
ListUsersJdbcRepository.java
UsersFileRepository.java UsersLDAPRepository.java
Log:
removing avalon dependance in mailets.
Step four moving User and UserRepository to org.apache.mailet
Revision Changes Path
1.14 +1 -1 jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java
Index: AvalonUsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AvalonUsersStore.java 2 Oct 2002 06:12:02 -0000 1.13
+++ AvalonUsersStore.java 6 Jan 2003 15:52:59 -0000 1.14
@@ -19,8 +19,8 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
+import org.apache.mailet.UsersRepository;
import java.util.HashMap;
import java.util.Iterator;
1.26 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java
Index: NNTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- NNTPHandler.java 2 Nov 2002 09:03:52 -0000 1.25
+++ NNTPHandler.java 6 Jan 2003 15:53:00 -0000 1.26
@@ -22,7 +22,6 @@
import org.apache.james.nntpserver.repository.NNTPGroup;
import org.apache.james.nntpserver.repository.NNTPLineReaderImpl;
import org.apache.james.nntpserver.repository.NNTPRepository;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.RFC977DateFormat;
@@ -30,6 +29,7 @@
import org.apache.james.util.SimplifiedDateFormat;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogTarget;
+import org.apache.mailet.UsersRepository;
import java.io.BufferedReader;
import java.io.BufferedWriter;
1.2 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java
Index: NNTPHandlerConfigurationData.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandlerConfigurationData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NNTPHandlerConfigurationData.java 26 Oct 2002 04:15:29 -0000 1.1
+++ NNTPHandlerConfigurationData.java 6 Jan 2003 15:53:00 -0000 1.2
@@ -9,7 +9,7 @@
import org.apache.james.nntpserver.repository.NNTPRepository;
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
1.14 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/NNTPServer.java
Index: NNTPServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPServer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NNTPServer.java 28 Oct 2002 19:38:37 -0000 1.13
+++ NNTPServer.java 6 Jan 2003 15:53:00 -0000 1.14
@@ -25,11 +25,11 @@
import org.apache.james.core.AbstractJamesService;
import org.apache.james.nntpserver.repository.NNTPRepository;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
import org.apache.james.util.watchdog.WatchdogTarget;
+import org.apache.mailet.UsersRepository;
import java.net.InetAddress;
import java.net.UnknownHostException;
1.20 +1 -1 jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java
Index: POP3Handler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- POP3Handler.java 6 Jan 2003 12:38:26 -0000 1.19
+++ POP3Handler.java 6 Jan 2003 15:53:00 -0000 1.20
@@ -16,7 +16,6 @@
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.util.ExtraDotOutputStream;
import org.apache.james.util.InternetPrintWriter;
@@ -25,6 +24,7 @@
import org.apache.james.util.watchdog.WatchdogTarget;
import org.apache.mailet.Mail;
import org.apache.mailet.MailRepository;
+import org.apache.mailet.UsersRepository;
import javax.mail.MessagingException;
import java.io.*;
1.2 +1 -1 jakarta-james/src/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java
Index: POP3HandlerConfigurationData.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- POP3HandlerConfigurationData.java 26 Oct 2002 04:15:30 -0000 1.1
+++ POP3HandlerConfigurationData.java 6 Jan 2003 15:53:00 -0000 1.2
@@ -8,7 +8,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
1.14 +1 -1 jakarta-james/src/java/org/apache/james/pop3server/POP3Server.java
Index: POP3Server.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Server.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- POP3Server.java 28 Oct 2002 19:38:37 -0000 1.13
+++ POP3Server.java 6 Jan 2003 15:53:00 -0000 1.14
@@ -25,11 +25,11 @@
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
import org.apache.james.util.watchdog.WatchdogTarget;
+import org.apache.mailet.UsersRepository;
import java.net.InetAddress;
import java.net.UnknownHostException;
1.13 +1 -0 jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.java
Index: RemoteManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RemoteManager.java 28 Oct 2002 19:38:37 -0000 1.12
+++ RemoteManager.java 6 Jan 2003 15:53:00 -0000 1.13
@@ -28,6 +28,7 @@
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
import org.apache.james.util.watchdog.WatchdogTarget;
+import org.apache.mailet.*;
import java.net.InetAddress;
import java.net.UnknownHostException;
1.22 +2 -1 jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
Index: RemoteManagerHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RemoteManagerHandler.java 2 Nov 2002 09:03:52 -0000 1.21
+++ RemoteManagerHandler.java 6 Jan 2003 15:53:00 -0000 1.22
@@ -19,6 +19,7 @@
import org.apache.james.userrepository.DefaultUser;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogTarget;
+import org.apache.mailet.*;
import org.apache.mailet.MailAddress;
import javax.mail.internet.ParseException;
1.2 +1 -1 jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
Index: RemoteManagerHandlerConfigurationData.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteManagerHandlerConfigurationData.java 26 Oct 2002 04:15:30 -0000 1.1
+++ RemoteManagerHandlerConfigurationData.java 6 Jan 2003 15:53:01 -0000 1.2
@@ -8,8 +8,8 @@
package org.apache.james.remotemanager;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
+import org.apache.mailet.UsersRepository;
import java.util.HashMap;
1.5 +2 -1 jakarta-james/src/java/org/apache/james/services/JamesUser.java
Index: JamesUser.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/JamesUser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JamesUser.java 14 Sep 2002 09:00:57 -0000 1.4
+++ JamesUser.java 6 Jan 2003 15:53:01 -0000 1.5
@@ -7,6 +7,7 @@
*/
package org.apache.james.services;
+import org.apache.mailet.*;
import org.apache.mailet.MailAddress;
/**
1.7 +2 -2 jakarta-james/src/java/org/apache/james/services/MailStore.java
Index: MailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/MailStore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MailStore.java 6 Jan 2003 12:38:05 -0000 1.6
+++ MailStore.java 6 Jan 2003 15:53:01 -0000 1.7
@@ -8,7 +8,7 @@
package org.apache.james.services;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.mailet.*;
+import org.apache.mailet.SpoolRepository;
/**
* Interface for an object which provides MailRepositories or SpoolRepositories
1.7 +2 -0 jakarta-james/src/java/org/apache/james/services/UsersStore.java
Index: UsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/UsersStore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UsersStore.java 16 Aug 2002 22:00:07 -0000 1.6
+++ UsersStore.java 6 Jan 2003 15:53:01 -0000 1.7
@@ -9,6 +9,8 @@
import java.util.Iterator;
+import org.apache.mailet.UsersRepository;
+
/**
* Interface for Phoenix blocks to access a store of Users. A UserStore
* contains one or more UserRepositories. Multiple UserRepositories may or may
1.36 +3 -2 jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java
Index: SMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- SMTPHandler.java 2 Nov 2002 09:03:51 -0000 1.35
+++ SMTPHandler.java 6 Jan 2003 15:53:01 -0000 1.36
@@ -15,12 +15,13 @@
import org.apache.james.core.MailHeaders;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.util.*;
import org.apache.james.util.watchdog.BytesReadResetInputStream;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogTarget;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.UsersRepository;
+
import javax.mail.MessagingException;
import java.io.*;
import java.net.Socket;
1.2 +1 -1 jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java
Index: SMTPHandlerConfigurationData.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SMTPHandlerConfigurationData.java 26 Oct 2002 04:15:30 -0000 1.1
+++ SMTPHandlerConfigurationData.java 6 Jan 2003 15:53:01 -0000 1.2
@@ -8,7 +8,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
1.18 +2 -1 jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.java
Index: SMTPServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SMTPServer.java 2 Nov 2002 08:31:56 -0000 1.17
+++ SMTPServer.java 6 Jan 2003 15:53:01 -0000 1.18
@@ -25,12 +25,13 @@
import org.apache.james.Constants;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
-import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
import org.apache.james.util.watchdog.WatchdogTarget;
import org.apache.mailet.MailetContext;
+import org.apache.mailet.UsersRepository;
+
import java.net.InetAddress;
import java.net.UnknownHostException;
/**
1.15 +1 -1 jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
Index: AbstractJdbcUsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractJdbcUsersRepository.java 27 Nov 2002 06:16:49 -0000 1.14
+++ AbstractJdbcUsersRepository.java 6 Jan 2003 15:53:01 -0000 1.15
@@ -22,9 +22,9 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.james.context.AvalonContextUtilities;
-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.*;
1.10 +2 -2 jakarta-james/src/java/org/apache/james/userrepository/AbstractUsersRepository.java
Index: AbstractUsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractUsersRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractUsersRepository.java 25 Sep 2002 22:53:45 -0000 1.9
+++ AbstractUsersRepository.java 6 Jan 2003 15:53:01 -0000 1.10
@@ -9,8 +9,8 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import java.util.Iterator;
import java.util.LinkedList;
1.7 +2 -2 jakarta-james/src/java/org/apache/james/userrepository/DefaultUser.java
Index: DefaultUser.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/DefaultUser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultUser.java 14 Sep 2002 09:00:58 -0000 1.6
+++ DefaultUser.java 6 Jan 2003 15:53:01 -0000 1.7
@@ -8,7 +8,7 @@
package org.apache.james.userrepository;
import org.apache.james.security.DigestUtil;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
import java.io.Serializable;
import java.security.NoSuchAlgorithmException;
1.4 +1 -1 jakarta-james/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
Index: DefaultUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultUsersJdbcRepository.java 19 Aug 2002 18:57:08 -0000 1.3
+++ DefaultUsersJdbcRepository.java 6 Jan 2003 15:53:01 -0000 1.4
@@ -7,7 +7,7 @@
*/
package org.apache.james.userrepository;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
1.7 +1 -1 jakarta-james/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
Index: JamesUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JamesUsersJdbcRepository.java 2 Oct 2002 06:12:03 -0000 1.6
+++ JamesUsersJdbcRepository.java 6 Jan 2003 15:53:02 -0000 1.7
@@ -7,8 +7,8 @@
*/
package org.apache.james.userrepository;
-import org.apache.james.services.User;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.User;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
1.5 +1 -1 jakarta-james/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
Index: ListUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListUsersJdbcRepository.java 19 Aug 2002 18:57:08 -0000 1.4
+++ ListUsersJdbcRepository.java 6 Jan 2003 15:53:02 -0000 1.5
@@ -7,7 +7,7 @@
*/
package org.apache.james.userrepository;
-import org.apache.james.services.User;
+import org.apache.mailet.User;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
1.11 +3 -3 jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java
Index: UsersFileRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UsersFileRepository.java 2 Oct 2002 06:12:03 -0000 1.10
+++ UsersFileRepository.java 6 Jan 2003 15:53:02 -0000 1.11
@@ -19,8 +19,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import java.io.File;
import java.util.Iterator;
1.10 +2 -2 jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java
Index: UsersLDAPRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UsersLDAPRepository.java 2 Oct 2002 06:12:03 -0000 1.9
+++ UsersLDAPRepository.java 6 Jan 2003 15:53:02 -0000 1.10
@@ -19,8 +19,8 @@
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.james.Constants;
-import org.apache.james.services.User;
-import org.apache.james.services.UsersRepository;
+import org.apache.mailet.User;
+import org.apache.mailet.UsersRepository;
import javax.naming.AuthenticationException;
import javax.naming.NamingEnumeration;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>