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 ch...@apache.org on 2001/04/28 14:43:19 UTC
cvs commit: jakarta-james/src/org/apache/james/userrepository UsersFileRepository.java UsersLDAPRepository.java UsersTownRepository.java
charlesb 01/04/28 05:43:19
Modified: . build.xml
lib avalon-jmx.jar cornerstone.bar phoenix-client.jar
phoenix-engine.jar phoenix-loader.jar
src/org/apache/james James.java
src/org/apache/james/core AvalonMailStore.java
AvalonUsersStore.java MailetConfigImpl.java
src/org/apache/james/dnsserver DNSServer.java
src/org/apache/james/imapserver ACLMailbox.java
BaseCommand.java FileMailbox.java Flags.java
Host.java IMAPServer.java IMAPSystem.java
JamesHost.java Mailbox.java SimpleFolderRecord.java
SimpleSystem.java
SingleThreadedConnectionHandler.java
src/org/apache/james/mailrepository
AvalonMailRepository.java
FileMimeMessageInputStream.java
TownSpoolRepository.java
src/org/apache/james/nntpserver NNTPHandler.java
NNTPServer.java NNTPServer.xinfo
src/org/apache/james/nntpserver/repository
ArticleIDRepository.java NNTPGroup.java
NNTPGroupImpl.java NNTPRepository.java
NNTPRepositoryImpl.java NNTPSpooler.java
NNTPUtil.java
src/org/apache/james/pop3server POP3Handler.java
POP3Server.java POP3Server.xinfo
src/org/apache/james/remotemanager RemoteManager.java
RemoteManager.xinfo RemoteManagerHandler.java
src/org/apache/james/services MailServer.java MailStore.java
UsersStore.java
src/org/apache/james/smtpserver SMTPHandler.java
SMTPServer.java SMTPServer.xinfo
SizeLimitedSMTPHandler.java
src/org/apache/james/testing NNTPClient.java
src/org/apache/james/transport JamesSpoolManager.java
JamesSpoolManager.xinfo LinearProcessor.java
MailetLoader.java MatchLoader.java
src/org/apache/james/transport/mailets AvalonListserv.java
AvalonListservManager.java RemoteDelivery.java
ToRepository.java
src/org/apache/james/userrepository UsersFileRepository.java
UsersLDAPRepository.java UsersTownRepository.java
Added: lib avalon-excalibur.jar avalon-framework.jar
Removed: lib avalonapi.jar
Log:
Major avalon package renaming. Compiles. Excution not yet tested.
Revision Changes Path
1.54 +3 -2 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- build.xml 2001/04/26 16:06:37 1.53
+++ build.xml 2001/04/28 12:43:10 1.54
@@ -69,7 +69,7 @@
<target name="init">
- <property name="classpath" value="./lib/avalonapi.jar;./lib/logkit.jar;./lib/phoenix-client.jar;./lib/cornerstone.bar;./lib/activation.jar;./lib/mail_1_2.jar;./lib/xerces.jar;./lib/dnsjava.jar;./lib/town.jar;./lib/velocity-0.71.jar;./lib/jakarta-oro-2.0.1.jar"/>
+ <property name="classpath" value="./lib/avalon-framework.jar;./lib/avalon-excalibur.jar;./lib/logkit.jar;./lib/phoenix-client.jar;./lib/cornerstone.bar;./lib/activation.jar;./lib/mail_1_2.jar;./lib/xerces.jar;./lib/dnsjava.jar;./lib/town.jar;./lib/velocity-0.71.jar;./lib/jakarta-oro-2.0.1.jar"/>
<property name="src.dir" value="src"/>
<property name="conf.dir" value="conf"/>
@@ -268,7 +268,8 @@
<copy todir="${dist.dir}/lib">
<fileset dir="lib">
<include name="phoenix-client.jar"/>
- <include name="avalonapi.jar"/>
+ <include name="avalon-framework.jar"/>
+ <include name="avalon-excalibur.jar"/>
<include name="avalon-jmx.jar"/>
<include name="jmxri.jar"/>
<include name="jmxtools.jar"/>
1.3 +75 -59 jakarta-james/lib/avalon-jmx.jar
<<Binary file>>
1.14 +257 -252 jakarta-james/lib/cornerstone.bar
<<Binary file>>
1.9 +17 -17 jakarta-james/lib/phoenix-client.jar
<<Binary file>>
1.9 +397 -351 jakarta-james/lib/phoenix-engine.jar
<<Binary file>>
1.9 +25 -32 jakarta-james/lib/phoenix-loader.jar
<<Binary file>>
1.1 jakarta-james/lib/avalon-excalibur.jar
<<Binary file>>
1.1 jakarta-james/lib/avalon-framework.jar
<<Binary file>>
1.37 +18 -18 jakarta-james/src/org/apache/james/James.java
Index: James.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/James.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- James.java 2001/04/25 14:45:56 1.36
+++ James.java 2001/04/28 12:43:12 1.37
@@ -14,22 +14,22 @@
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.component.DefaultComponentManager;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.DefaultConfiguration;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.context.DefaultContext;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.excalibur.thread.ThreadPool;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.component.DefaultComponentManager;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.james.core.*;
import org.apache.james.imapserver.*;
import org.apache.james.services.*;
@@ -37,8 +37,8 @@
import org.apache.log.Logger;
import org.apache.log.Priority;
import org.apache.mailet.*;
-import org.apache.phoenix.Block;
-import org.apache.phoenix.BlockContext;
+import org.apache.avalon.phoenix.Block;
+import org.apache.avalon.phoenix.BlockContext;
/**
* Core class for JAMES. Provides three primary services:
1.10 +12 -12 jakarta-james/src/org/apache/james/core/AvalonMailStore.java
Index: AvalonMailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/core/AvalonMailStore.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AvalonMailStore.java 2001/04/25 14:45:58 1.9
+++ AvalonMailStore.java 2001/04/28 12:43:12 1.10
@@ -9,22 +9,22 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailStore;
import org.apache.log.LogKit;
import org.apache.log.Logger;
-import org.apache.phoenix.Block;
+import org.apache.avalon.phoenix.Block;
/**
*
1.10 +10 -10 jakarta-james/src/org/apache/james/core/AvalonUsersStore.java
Index: AvalonUsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AvalonUsersStore.java 2001/04/25 14:45:58 1.9
+++ AvalonUsersStore.java 2001/04/28 12:43:12 1.10
@@ -11,18 +11,18 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
-import org.apache.phoenix.Block;
+import org.apache.avalon.phoenix.Block;
/**
*
1.6 +2 -2 jakarta-james/src/org/apache/james/core/MailetConfigImpl.java
Index: MailetConfigImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/core/MailetConfigImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MailetConfigImpl.java 2001/04/19 04:06:35 1.5
+++ MailetConfigImpl.java 2001/04/28 12:43:12 1.6
@@ -12,8 +12,8 @@
import java.util.*;
import javax.mail.*;
import javax.mail.internet.*;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.mailet.*;
/**
1.14 +7 -7 jakarta-james/src/org/apache/james/dnsserver/DNSServer.java
Index: DNSServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/dnsserver/DNSServer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DNSServer.java 2001/04/25 14:46:00 1.13
+++ DNSServer.java 2001/04/28 12:43:12 1.14
@@ -15,14 +15,14 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Vector;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.james.transport.Resources;
-import org.apache.phoenix.Block;
+import org.apache.avalon.phoenix.Block;
import org.xbill.DNS.*;
/**
1.6 +3 -3 jakarta-james/src/org/apache/james/imapserver/ACLMailbox.java
Index: ACLMailbox.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/ACLMailbox.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ACLMailbox.java 2001/04/25 14:46:03 1.5
+++ ACLMailbox.java 2001/04/28 12:43:13 1.6
@@ -7,9 +7,9 @@
*/
package org.apache.james.imapserver;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.context.Contextualizable;
/**
* Interface for objects representing an IMAP4rev1 mailbox (folder) with
1.5 +1 -1 jakarta-james/src/org/apache/james/imapserver/BaseCommand.java
Index: BaseCommand.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/BaseCommand.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseCommand.java 2001/04/19 04:06:41 1.4
+++ BaseCommand.java 2001/04/28 12:43:13 1.5
@@ -13,7 +13,7 @@
import java.util.*;
import javax.mail.MessagingException;
import javax.mail.internet.InternetHeaders;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
import org.apache.james.core.EnhancedMimeMessage;
1.8 +4 -4 jakarta-james/src/org/apache/james/imapserver/FileMailbox.java
Index: FileMailbox.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/FileMailbox.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileMailbox.java 2001/04/26 06:01:38 1.7
+++ FileMailbox.java 2001/04/28 12:43:13 1.8
@@ -12,10 +12,10 @@
import java.util.*;
import javax.mail.*;
import javax.mail.internet.*;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
import org.apache.james.Constants;
1.4 +1 -1 jakarta-james/src/org/apache/james/imapserver/Flags.java
Index: Flags.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/Flags.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Flags.java 2001/04/25 14:46:04 1.3
+++ Flags.java 2001/04/28 12:43:13 1.4
@@ -10,7 +10,7 @@
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
-import org.apache.avalon.activity.Initializable;
+import org.apache.avalon.framework.activity.Initializable;
/**
* The set of flags associated with a message. The \Seen flag is maintained
1.7 +7 -6 jakarta-james/src/org/apache/james/imapserver/Host.java
Index: Host.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/Host.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Host.java 2001/04/19 04:06:42 1.6
+++ Host.java 2001/04/28 12:43:13 1.7
@@ -9,11 +9,12 @@
import java.util.Collection;
import java.util.List;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.phoenix.Service;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
@@ -34,7 +35,7 @@
* @see RecordRepository
*/
public interface Host
- extends Configurable, Composable, Contextualizable, org.apache.phoenix.Service {
+ extends Configurable, Composable, Contextualizable, Service {
String IMAP_HOST = "IMAP_HOST";
1.13 +6 -6 jakarta-james/src/org/apache/james/imapserver/IMAPServer.java
Index: IMAPServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/IMAPServer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- IMAPServer.java 2001/04/26 06:01:38 1.12
+++ IMAPServer.java 2001/04/28 12:43:13 1.13
@@ -9,12 +9,12 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.cornerstone.services.connection.AbstractService;
-import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.cornerstone.services.connection.AbstractService;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
/**
* The Server listens on a specified port and passes connections to a
1.7 +5 -5 jakarta-james/src/org/apache/james/imapserver/IMAPSystem.java
Index: IMAPSystem.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/IMAPSystem.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IMAPSystem.java 2001/04/19 04:06:43 1.6
+++ IMAPSystem.java 2001/04/28 12:43:13 1.7
@@ -8,11 +8,11 @@
package org.apache.james.imapserver;
import java.util.Iterator;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.Contextualizable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.james.AuthenticationException;
/**
1.9 +6 -6 jakarta-james/src/org/apache/james/imapserver/JamesHost.java
Index: JamesHost.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/JamesHost.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JamesHost.java 2001/04/25 14:46:04 1.8
+++ JamesHost.java 2001/04/28 12:43:13 1.9
@@ -12,12 +12,12 @@
import java.util.*;
import javax.mail.*;
import javax.mail.internet.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
import org.apache.james.services.*;
1.7 +2 -2 jakarta-james/src/org/apache/james/imapserver/Mailbox.java
Index: Mailbox.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/Mailbox.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Mailbox.java 2001/04/19 04:06:44 1.6
+++ Mailbox.java 2001/04/28 12:43:13 1.7
@@ -11,8 +11,8 @@
import java.util.Map;
import javax.mail.internet.InternetHeaders;
import javax.mail.internet.MimeMessage;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
import org.apache.james.AccessControlException;
import org.apache.james.AuthorizationException;
import org.apache.james.core.EnhancedMimeMessage;
1.4 +1 -1 jakarta-james/src/org/apache/james/imapserver/SimpleFolderRecord.java
Index: SimpleFolderRecord.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/SimpleFolderRecord.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleFolderRecord.java 2001/04/25 14:46:05 1.3
+++ SimpleFolderRecord.java 2001/04/28 12:43:13 1.4
@@ -10,7 +10,7 @@
import java.io.Serializable;
import java.util.Map;
import java.util.Set;
-import org.apache.avalon.activity.Initializable;
+import org.apache.avalon.framework.activity.Initializable;
/**
* Object representing the record of a folder in an IMAP on an IMAP Host.
1.7 +6 -6 jakarta-james/src/org/apache/james/imapserver/SimpleSystem.java
Index: SimpleSystem.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/SimpleSystem.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleSystem.java 2001/04/25 14:46:05 1.6
+++ SimpleSystem.java 2001/04/28 12:43:13 1.7
@@ -8,12 +8,12 @@
package org.apache.james.imapserver;
import java.util.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
import org.apache.james.AuthenticationException;
/**
1.16 +15 -15 jakarta-james/src/org/apache/james/imapserver/SingleThreadedConnectionHandler.java
Index: SingleThreadedConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/SingleThreadedConnectionHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SingleThreadedConnectionHandler.java 2001/04/26 06:01:39 1.15
+++ SingleThreadedConnectionHandler.java 2001/04/28 12:43:13 1.16
@@ -12,21 +12,21 @@
import java.text.*;
import java.util.*;
import javax.mail.internet.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.cornerstone.services.connection.ConnectionHandler;
-import org.apache.cornerstone.services.scheduler.PeriodicTimeTrigger;
-import org.apache.cornerstone.services.scheduler.Target;
-import org.apache.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
import org.apache.james.AccessControlException;
import org.apache.james.AuthenticationException;
import org.apache.james.AuthorizationException;
1.15 +12 -12 jakarta-james/src/org/apache/james/mailrepository/AvalonMailRepository.java
Index: AvalonMailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/mailrepository/AvalonMailRepository.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AvalonMailRepository.java 2001/04/19 04:06:51 1.14
+++ AvalonMailRepository.java 2001/04/28 12:43:14 1.15
@@ -10,18 +10,18 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Iterator;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.DefaultConfiguration;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cornerstone.services.store.ObjectRepository;
-import org.apache.cornerstone.services.store.Store;
-import org.apache.cornerstone.services.store.StreamRepository;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.cornerstone.services.store.ObjectRepository;
+import org.apache.avalon.cornerstone.services.store.Store;
+import org.apache.avalon.cornerstone.services.store.StreamRepository;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailStore;
1.5 +1 -1 jakarta-james/src/org/apache/james/mailrepository/FileMimeMessageInputStream.java
Index: FileMimeMessageInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/mailrepository/FileMimeMessageInputStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileMimeMessageInputStream.java 2001/03/13 06:00:33 1.4
+++ FileMimeMessageInputStream.java 2001/04/28 12:43:14 1.5
@@ -9,7 +9,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.cornerstone.services.store.StreamRepository;
+import org.apache.avalon.cornerstone.services.store.StreamRepository;
import org.apache.james.core.JamesMimeMessageInputStream;
public class FileMimeMessageInputStream
1.13 +5 -5 jakarta-james/src/org/apache/james/mailrepository/TownSpoolRepository.java
Index: TownSpoolRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/mailrepository/TownSpoolRepository.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TownSpoolRepository.java 2001/04/19 04:06:51 1.12
+++ TownSpoolRepository.java 2001/04/28 12:43:14 1.13
@@ -21,11 +21,11 @@
import java.util.Set;
import java.util.StringTokenizer;
import javax.mail.internet.MimeMessage;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.james.core.JamesMimeMessage;
import org.apache.james.core.MailImpl;
import org.apache.james.services.SpoolRepository;
1.7 +16 -16 jakarta-james/src/org/apache/james/nntpserver/NNTPHandler.java
Index: NNTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/NNTPHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NNTPHandler.java 2001/04/26 06:01:41 1.6
+++ NNTPHandler.java 2001/04/28 12:43:14 1.7
@@ -24,22 +24,22 @@
import java.util.List;
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cornerstone.services.connection.ConnectionHandler;
-import org.apache.cornerstone.services.scheduler.PeriodicTimeTrigger;
-import org.apache.cornerstone.services.scheduler.Target;
-import org.apache.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.excalibur.collections.ListUtils;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.avalon.excalibur.collections.ListUtils;
import org.apache.james.Constants;
import org.apache.james.nntpserver.repository.NNTPArticle;
import org.apache.james.nntpserver.repository.NNTPGroup;
1.6 +10 -10 jakarta-james/src/org/apache/james/nntpserver/NNTPServer.java
Index: NNTPServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/NNTPServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NNTPServer.java 2001/04/26 06:01:43 1.5
+++ NNTPServer.java 2001/04/28 12:43:14 1.6
@@ -9,16 +9,16 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.DefaultComponentManager;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.cornerstone.services.connection.AbstractService;
-import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.DefaultComponentManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.cornerstone.services.connection.AbstractService;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
/**
* @author Harmeet <hb...@apache.org>
1.2 +4 -4 jakarta-james/src/org/apache/james/nntpserver/NNTPServer.xinfo
Index: NNTPServer.xinfo
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/NNTPServer.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NNTPServer.xinfo 2001/04/21 05:53:35 1.1
+++ NNTPServer.xinfo 2001/04/28 12:43:14 1.2
@@ -2,7 +2,7 @@
<blockinfo>
<services>
- <service name="org.apache.avalon.component.Component" version="1.0"/>
+ <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
</services>
<dependencies>
@@ -15,16 +15,16 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.connection.ConnectionManager</role>
+ <role>org.apache.avalon.cornerstone.services.connection.ConnectionManager</role>
<service name="org.apache.cornerstone.services.connection.ConnectionManager"
version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.sockets.SocketManager</role>
+ <role>org.apache.avalon.cornerstone.services.sockets.SocketManager</role>
<service name="org.apache.cornerstone.services.sockets.SocketManager" version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.scheduler.TimeScheduler</role>
+ <role>org.apache.avalon.cornerstone.services.scheduler.TimeScheduler</role>
<service name="org.apache.cornerstone.services.scheduler.TimeScheduler" version="1.0"/>
</dependency>
<dependency>
1.3 +3 -3 jakarta-james/src/org/apache/james/nntpserver/repository/ArticleIDRepository.java
Index: ArticleIDRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/repository/ArticleIDRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArticleIDRepository.java 2001/04/17 03:16:34 1.2
+++ ArticleIDRepository.java 2001/04/28 12:43:15 1.3
@@ -9,9 +9,9 @@
import java.util.*;
import java.io.*;
-import org.apache.excalibur.io.ExtensionFileFilter;
-import org.apache.excalibur.io.InvertedFileFilter;
-import org.apache.excalibur.io.AndFileFilter;
+import org.apache.avalon.excalibur.io.ExtensionFileFilter;
+import org.apache.avalon.excalibur.io.InvertedFileFilter;
+import org.apache.avalon.excalibur.io.AndFileFilter;
import org.apache.james.nntpserver.NNTPException;
import org.apache.james.nntpserver.DateSinceFileFilter;
import sun.misc.BASE64Encoder;
1.3 +3 -3 jakarta-james/src/org/apache/james/nntpserver/repository/NNTPGroup.java
Index: NNTPGroup.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/repository/NNTPGroup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPGroup.java 2001/04/17 03:16:35 1.2
+++ NNTPGroup.java 2001/04/28 12:43:15 1.3
@@ -9,9 +9,9 @@
import java.util.*;
import java.io.*;
-import org.apache.excalibur.io.ExtensionFileFilter;
-import org.apache.excalibur.io.InvertedFileFilter;
-import org.apache.excalibur.io.AndFileFilter;
+import org.apache.avalon.excalibur.io.ExtensionFileFilter;
+import org.apache.avalon.excalibur.io.InvertedFileFilter;
+import org.apache.avalon.excalibur.io.AndFileFilter;
import org.apache.james.nntpserver.NNTPException;
import org.apache.james.nntpserver.DateSinceFileFilter;
1.3 +3 -3 jakarta-james/src/org/apache/james/nntpserver/repository/NNTPGroupImpl.java
Index: NNTPGroupImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/repository/NNTPGroupImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPGroupImpl.java 2001/04/17 03:16:35 1.2
+++ NNTPGroupImpl.java 2001/04/28 12:43:15 1.3
@@ -9,9 +9,9 @@
import java.util.*;
import java.io.*;
-import org.apache.excalibur.io.ExtensionFileFilter;
-import org.apache.excalibur.io.InvertedFileFilter;
-import org.apache.excalibur.io.AndFileFilter;
+import org.apache.avalon.excalibur.io.ExtensionFileFilter;
+import org.apache.avalon.excalibur.io.InvertedFileFilter;
+import org.apache.avalon.excalibur.io.AndFileFilter;
import org.apache.james.nntpserver.NNTPException;
import org.apache.james.nntpserver.DateSinceFileFilter;
1.5 +7 -7 jakarta-james/src/org/apache/james/nntpserver/repository/NNTPRepository.java
Index: NNTPRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/repository/NNTPRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NNTPRepository.java 2001/04/26 06:01:44 1.4
+++ NNTPRepository.java 2001/04/28 12:43:15 1.5
@@ -9,13 +9,13 @@
import java.io.*;
import java.util.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.excalibur.io.AndFileFilter;
-import org.apache.excalibur.io.DirectoryFileFilter;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.excalibur.io.AndFileFilter;
+import org.apache.avalon.excalibur.io.DirectoryFileFilter;
import org.apache.oro.io.GlobFilenameFilter;
public interface NNTPRepository {
1.6 +9 -9 jakarta-james/src/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
Index: NNTPRepositoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NNTPRepositoryImpl.java 2001/04/25 14:46:11 1.5
+++ NNTPRepositoryImpl.java 2001/04/28 12:43:15 1.6
@@ -9,18 +9,18 @@
import java.io.*;
import java.util.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.excalibur.io.AndFileFilter;
-import org.apache.excalibur.io.DirectoryFileFilter;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.excalibur.io.AndFileFilter;
+import org.apache.avalon.excalibur.io.DirectoryFileFilter;
import org.apache.james.nntpserver.DateSinceFileFilter;
import org.apache.james.nntpserver.NNTPException;
import org.apache.oro.io.GlobFilenameFilter;
-import org.apache.phoenix.Block;
+import org.apache.avalon.phoenix.Block;
public class NNTPRepositoryImpl extends AbstractLoggable
implements NNTPRepository, Configurable, Initializable, Block
1.6 +7 -7 jakarta-james/src/org/apache/james/nntpserver/repository/NNTPSpooler.java
Index: NNTPSpooler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/repository/NNTPSpooler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NNTPSpooler.java 2001/04/26 06:01:45 1.5
+++ NNTPSpooler.java 2001/04/28 12:43:15 1.6
@@ -10,13 +10,13 @@
import java.io.*;
import java.util.*;
import javax.mail.internet.MimeMessage;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.avalon.logger.Loggable;
-import org.apache.excalibur.io.IOUtil;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.james.util.Lock;
// processes entries and sends to appropriate groups.
1.5 +5 -5 jakarta-james/src/org/apache/james/nntpserver/repository/NNTPUtil.java
Index: NNTPUtil.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/nntpserver/repository/NNTPUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NNTPUtil.java 2001/04/26 06:01:45 1.4
+++ NNTPUtil.java 2001/04/28 12:43:15 1.5
@@ -8,11 +8,11 @@
package org.apache.james.nntpserver.repository;
import java.io.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.james.nntpserver.NNTPException;
import org.apache.log.Logger;
1.44 +16 -16 jakarta-james/src/org/apache/james/pop3server/POP3Handler.java
Index: POP3Handler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- POP3Handler.java 2001/04/26 06:01:48 1.43
+++ POP3Handler.java 2001/04/28 12:43:16 1.44
@@ -19,22 +19,22 @@
import java.util.StringTokenizer;
import java.util.Vector;
import javax.mail.MessagingException;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cornerstone.services.connection.ConnectionHandler;
-import org.apache.cornerstone.services.scheduler.PeriodicTimeTrigger;
-import org.apache.cornerstone.services.scheduler.Target;
-import org.apache.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.excalibur.collections.ListUtils;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.avalon.excalibur.collections.ListUtils;
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailRepository;
1.23 +5 -5 jakarta-james/src/org/apache/james/pop3server/POP3Server.java
Index: POP3Server.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/pop3server/POP3Server.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- POP3Server.java 2001/04/26 06:01:49 1.22
+++ POP3Server.java 2001/04/28 12:43:16 1.23
@@ -9,11 +9,11 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.cornerstone.services.connection.AbstractService;
-import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.cornerstone.services.connection.AbstractService;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
/**
* @version 1.0.0, 24/04/1999
1.2 +7 -7 jakarta-james/src/org/apache/james/pop3server/POP3Server.xinfo
Index: POP3Server.xinfo
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/pop3server/POP3Server.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- POP3Server.xinfo 2001/04/21 05:53:40 1.1
+++ POP3Server.xinfo 2001/04/28 12:43:16 1.2
@@ -2,7 +2,7 @@
<blockinfo>
<services>
- <service name="org.apache.avalon.component.Component" version="1.0"/>
+ <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
</services>
<dependencies>
@@ -15,17 +15,17 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.connection.ConnectionManager</role>
- <service name="org.apache.cornerstone.services.connection.ConnectionManager"
+ <role>org.apache.avalon.cornerstone.services.connection.ConnectionManager</role>
+ <service name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.sockets.SocketManager</role>
- <service name="org.apache.cornerstone.services.sockets.SocketManager" version="1.0"/>
+ <role>org.apache.avalon.cornerstone.services.sockets.SocketManager</role>
+ <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.scheduler.TimeScheduler</role>
- <service name="org.apache.cornerstone.services.scheduler.TimeScheduler" version="1.0"/>
+ <role>org.apache.avalon.cornerstone.services.scheduler.TimeScheduler</role>
+ <service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler" version="1.0"/>
</dependency>
<dependency>
<role>org.apache.james.services.MailServer</role>
1.26 +5 -5 jakarta-james/src/org/apache/james/remotemanager/RemoteManager.java
Index: RemoteManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/remotemanager/RemoteManager.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- RemoteManager.java 2001/04/26 06:01:51 1.25
+++ RemoteManager.java 2001/04/28 12:43:16 1.26
@@ -9,11 +9,11 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.cornerstone.services.connection.AbstractService;
-import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.cornerstone.services.connection.AbstractService;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
/**
* Provides a really rude network interface to administer James.
1.2 +7 -7 jakarta-james/src/org/apache/james/remotemanager/RemoteManager.xinfo
Index: RemoteManager.xinfo
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/remotemanager/RemoteManager.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoteManager.xinfo 2001/04/21 05:53:42 1.1
+++ RemoteManager.xinfo 2001/04/28 12:43:16 1.2
@@ -2,7 +2,7 @@
<blockinfo>
<services>
- <service name="org.apache.avalon.component.Component" version="1.0"/>
+ <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
</services>
<dependencies>
@@ -15,17 +15,17 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.connection.ConnectionManager</role>
- <service name="org.apache.cornerstone.services.connection.ConnectionManager"
+ <role>org.apache.avalon.cornerstone.services.connection.ConnectionManager</role>
+ <service name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.sockets.SocketManager</role>
- <service name="org.apache.cornerstone.services.sockets.SocketManager" version="1.0"/>
+ <role>org.apache.avalon.cornerstone.services.sockets.SocketManager</role>
+ <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.scheduler.TimeScheduler</role>
- <service name="org.apache.cornerstone.services.scheduler.TimeScheduler" version="1.0"/>
+ <role>org.apache.avalon.cornerstone.services.scheduler.TimeScheduler</role>
+ <service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler" version="1.0"/>
</dependency>
<dependency>
<role>org.apache.james.services.MailServer</role>
1.8 +12 -12 jakarta-james/src/org/apache/james/remotemanager/RemoteManagerHandler.java
Index: RemoteManagerHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/remotemanager/RemoteManagerHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RemoteManagerHandler.java 2001/04/26 06:01:52 1.7
+++ RemoteManagerHandler.java 2001/04/28 12:43:16 1.8
@@ -10,18 +10,18 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cornerstone.services.connection.ConnectionHandler;
-import org.apache.cornerstone.services.scheduler.PeriodicTimeTrigger;
-import org.apache.cornerstone.services.scheduler.Target;
-import org.apache.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
import org.apache.james.Constants;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
1.5 +1 -1 jakarta-james/src/org/apache/james/services/MailServer.java
Index: MailServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/services/MailServer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailServer.java 2001/03/13 22:09:04 1.4
+++ MailServer.java 2001/04/28 12:43:17 1.5
@@ -13,7 +13,7 @@
import javax.mail.internet.*;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
-import org.apache.phoenix.Service;
+import org.apache.avalon.phoenix.Service;
/**
* The interface for Phoenix blocks to the James MailServer
1.6 +1 -1 jakarta-james/src/org/apache/james/services/MailStore.java
Index: MailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/services/MailStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MailStore.java 2001/03/13 22:09:05 1.5
+++ MailStore.java 2001/04/28 12:43:17 1.6
@@ -7,7 +7,7 @@
*/
package org.apache.james.services;
-import org.apache.cornerstone.services.store.Store;
+import org.apache.avalon.cornerstone.services.store.Store;
/**
* Interface for an object which provides MailRepositories or SpoolRepositories
1.6 +1 -1 jakarta-james/src/org/apache/james/services/UsersStore.java
Index: UsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/services/UsersStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UsersStore.java 2001/03/13 22:09:06 1.5
+++ UsersStore.java 2001/04/28 12:43:17 1.6
@@ -7,7 +7,7 @@
*/
package org.apache.james.services;
-import org.apache.phoenix.Service;
+import org.apache.avalon.phoenix.Service;
/**
* Interface for Phoenix blocks to access a store of Users. A UserStore
1.37 +15 -15 jakarta-james/src/org/apache/james/smtpserver/SMTPHandler.java
Index: SMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- SMTPHandler.java 2001/04/26 06:01:53 1.36
+++ SMTPHandler.java 2001/04/28 12:43:17 1.37
@@ -12,21 +12,21 @@
import java.util.*;
import javax.mail.*;
import javax.mail.internet.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cornerstone.services.connection.ConnectionHandler;
-import org.apache.cornerstone.services.scheduler.PeriodicTimeTrigger;
-import org.apache.cornerstone.services.scheduler.Target;
-import org.apache.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
import org.apache.james.*;
import org.apache.james.core.*;
import org.apache.james.services.MailServer;
1.24 +5 -5 jakarta-james/src/org/apache/james/smtpserver/SMTPServer.java
Index: SMTPServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/smtpserver/SMTPServer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SMTPServer.java 2001/04/26 06:01:53 1.23
+++ SMTPServer.java 2001/04/28 12:43:17 1.24
@@ -9,11 +9,11 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.cornerstone.services.connection.AbstractService;
-import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.cornerstone.services.connection.DefaultHandlerFactory;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.cornerstone.services.connection.AbstractService;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.avalon.cornerstone.services.connection.DefaultHandlerFactory;
/**
*
1.2 +7 -7 jakarta-james/src/org/apache/james/smtpserver/SMTPServer.xinfo
Index: SMTPServer.xinfo
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/smtpserver/SMTPServer.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SMTPServer.xinfo 2001/04/21 05:53:44 1.1
+++ SMTPServer.xinfo 2001/04/28 12:43:17 1.2
@@ -2,7 +2,7 @@
<blockinfo>
<services>
- <service name="org.apache.avalon.component.Component" version="1.0"/>
+ <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
</services>
<dependencies>
@@ -15,17 +15,17 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.connection.ConnectionManager</role>
- <service name="org.apache.cornerstone.services.connection.ConnectionManager"
+ <role>org.apache.avalon.cornerstone.services.connection.ConnectionManager</role>
+ <service name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.sockets.SocketManager</role>
- <service name="org.apache.cornerstone.services.sockets.SocketManager" version="1.0"/>
+ <role>org.apache.avalon.cornerstone.services.sockets.SocketManager</role>
+ <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>
</dependency>
<dependency>
- <role>org.apache.cornerstone.services.scheduler.TimeScheduler</role>
- <service name="org.apache.cornerstone.services.scheduler.TimeScheduler" version="1.0"/>
+ <role>org.apache.avalon.cornerstone.services.scheduler.TimeScheduler</role>
+ <service name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler" version="1.0"/>
</dependency>
<dependency>
<role>org.apache.james.services.MailServer</role>
1.7 +14 -14 jakarta-james/src/org/apache/james/smtpserver/SizeLimitedSMTPHandler.java
Index: SizeLimitedSMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/smtpserver/SizeLimitedSMTPHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SizeLimitedSMTPHandler.java 2001/04/26 06:01:54 1.6
+++ SizeLimitedSMTPHandler.java 2001/04/28 12:43:17 1.7
@@ -12,20 +12,20 @@
import java.util.*;
import javax.mail.*;
import javax.mail.internet.*;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cornerstone.services.connection.ConnectionHandler;
-import org.apache.cornerstone.services.scheduler.PeriodicTimeTrigger;
-import org.apache.cornerstone.services.scheduler.Target;
-import org.apache.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.avalon.cornerstone.services.scheduler.Target;
+import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
import org.apache.james.*;
import org.apache.james.core.*;
import org.apache.james.services.MailServer;
1.3 +1 -1 jakarta-james/src/org/apache/james/testing/NNTPClient.java
Index: NNTPClient.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/testing/NNTPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPClient.java 2001/04/17 03:16:38 1.2
+++ NNTPClient.java 2001/04/28 12:43:18 1.3
@@ -11,7 +11,7 @@
import javax.mail.*;
import javax.mail.internet.*;
import sun.net.nntp.*;
-import org.apache.excalibur.io.IOUtil;
+import org.apache.avalon.excalibur.io.IOUtil;
import java.io.*;
/**
1.32 +15 -15 jakarta-james/src/org/apache/james/transport/JamesSpoolManager.java
Index: JamesSpoolManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/JamesSpoolManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JamesSpoolManager.java 2001/04/26 06:01:56 1.31
+++ JamesSpoolManager.java 2001/04/28 12:43:18 1.32
@@ -11,25 +11,25 @@
import java.net.*;
import java.util.*;
import javax.mail.MessagingException;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.activity.Disposable;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.component.DefaultComponentManager;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.context.DefaultContext;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.excalibur.thread.ThreadPool;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.component.DefaultComponentManager;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.james.*;
import org.apache.james.core.*;
import org.apache.james.services.*;
import org.apache.mailet.*;
-import org.apache.phoenix.Block;
-import org.apache.phoenix.BlockContext;
+import org.apache.avalon.phoenix.Block;
+import org.apache.avalon.phoenix.BlockContext;
/**
* @author Serge Knystautas <se...@lokitech.com>
1.2 +1 -1 jakarta-james/src/org/apache/james/transport/JamesSpoolManager.xinfo
Index: JamesSpoolManager.xinfo
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/JamesSpoolManager.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JamesSpoolManager.xinfo 2001/04/21 05:53:47 1.1
+++ JamesSpoolManager.xinfo 2001/04/28 12:43:18 1.2
@@ -2,7 +2,7 @@
<blockinfo>
<services>
- <service name="org.apache.avalon.component.Component" version="1.0"/>
+ <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
</services>
<dependencies>
1.18 +2 -2 jakarta-james/src/org/apache/james/transport/LinearProcessor.java
Index: LinearProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/LinearProcessor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LinearProcessor.java 2001/04/26 06:01:56 1.17
+++ LinearProcessor.java 2001/04/28 12:43:18 1.18
@@ -10,8 +10,8 @@
import java.io.*;
import java.util.*;
import javax.mail.*;
-import org.apache.avalon.logger.Loggable;
-import org.apache.avalon.activity.Initializable;
+import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.james.*;
import org.apache.james.core.*;
import org.apache.james.services.SpoolRepository;
1.13 +4 -4 jakarta-james/src/org/apache/james/transport/MailetLoader.java
Index: MailetLoader.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/MailetLoader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MailetLoader.java 2001/04/19 04:07:06 1.12
+++ MailetLoader.java 2001/04/28 12:43:18 1.13
@@ -9,10 +9,10 @@
import java.util.*;
import javax.mail.*;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.component.Component;
+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.core.*;
import org.apache.mailet.*;
1.12 +4 -4 jakarta-james/src/org/apache/james/transport/MatchLoader.java
Index: MatchLoader.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/MatchLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MatchLoader.java 2001/04/19 04:07:06 1.11
+++ MatchLoader.java 2001/04/28 12:43:18 1.12
@@ -9,10 +9,10 @@
import java.util.*;
import javax.mail.*;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.framework.component.Component;
+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.core.*;
import org.apache.mailet.*;
1.5 +2 -2 jakarta-james/src/org/apache/james/transport/mailets/AvalonListserv.java
Index: AvalonListserv.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/mailets/AvalonListserv.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AvalonListserv.java 2001/04/19 04:07:08 1.4
+++ AvalonListserv.java 2001/04/28 12:43:18 1.5
@@ -10,8 +10,8 @@
import java.util.*;
import javax.mail.*;
import javax.mail.internet.*;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.james.*;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
1.6 +2 -2 jakarta-james/src/org/apache/james/transport/mailets/AvalonListservManager.java
Index: AvalonListservManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/mailets/AvalonListservManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AvalonListservManager.java 2001/04/19 04:07:08 1.5
+++ AvalonListservManager.java 2001/04/28 12:43:18 1.6
@@ -10,8 +10,8 @@
import java.util.*;
import javax.mail.*;
import javax.mail.internet.*;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
import org.apache.james.*;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
1.20 +4 -4 jakarta-james/src/org/apache/james/transport/mailets/RemoteDelivery.java
Index: RemoteDelivery.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/mailets/RemoteDelivery.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- RemoteDelivery.java 2001/04/19 04:07:11 1.19
+++ RemoteDelivery.java 2001/04/28 12:43:19 1.20
@@ -15,10 +15,10 @@
import javax.mail.Transport;
import javax.mail.URLName;
import javax.mail.internet.*;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.james.*;
import org.apache.james.core.*;
import org.apache.james.services.MailServer;
1.9 +4 -4 jakarta-james/src/org/apache/james/transport/mailets/ToRepository.java
Index: ToRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/transport/mailets/ToRepository.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ToRepository.java 2001/04/19 04:07:11 1.8
+++ ToRepository.java 2001/04/28 12:43:19 1.9
@@ -8,10 +8,10 @@
package org.apache.james.transport.mailets;
import java.util.*;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.james.*;
import org.apache.james.core.*;
import org.apache.james.services.MailRepository;
1.12 +13 -13 jakarta-james/src/org/apache/james/userrepository/UsersFileRepository.java
Index: UsersFileRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/userrepository/UsersFileRepository.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UsersFileRepository.java 2001/04/26 06:01:58 1.11
+++ UsersFileRepository.java 2001/04/28 12:43:19 1.12
@@ -9,19 +9,19 @@
import java.io.File;
import java.util.Iterator;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.component.ComponentException;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.configuration.DefaultConfiguration;
-import org.apache.avalon.logger.AbstractLoggable;
-import org.apache.cornerstone.services.store.ObjectRepository;
-import org.apache.cornerstone.services.store.Store;
-import org.apache.excalibur.concurrent.Lock;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.cornerstone.services.store.ObjectRepository;
+import org.apache.avalon.cornerstone.services.store.Store;
+import org.apache.avalon.excalibur.concurrent.Lock;
import org.apache.james.services.UsersRepository;
/**
1.10 +10 -10 jakarta-james/src/org/apache/james/userrepository/UsersLDAPRepository.java
Index: UsersLDAPRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/userrepository/UsersLDAPRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UsersLDAPRepository.java 2001/04/26 06:01:59 1.9
+++ UsersLDAPRepository.java 2001/04/28 12:43:19 1.10
@@ -11,16 +11,16 @@
import java.util.*;
import javax.naming.*;
import javax.naming.directory.*;
-import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.component.ComponentManager;
-import org.apache.avalon.component.Composable;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.context.Context;
-import org.apache.avalon.context.ContextException;
-import org.apache.avalon.context.Contextualizable;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.james.Constants;
import org.apache.james.services.UsersRepository;
import org.apache.log.Logger;
1.10 +5 -5 jakarta-james/src/org/apache/james/userrepository/UsersTownRepository.java
Index: UsersTownRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/userrepository/UsersTownRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UsersTownRepository.java 2001/04/19 04:07:30 1.9
+++ UsersTownRepository.java 2001/04/28 12:43:19 1.10
@@ -10,11 +10,11 @@
import com.workingdogs.town.*;
import java.io.*;
import java.util.*;
-import org.apache.avalon.component.Component;
-import org.apache.avalon.configuration.Configurable;
-import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.logger.Loggable;
+import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.james.services.UsersRepository;
import org.apache.log.LogKit;
import org.apache.log.Logger;
---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org