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 do...@apache.org on 2001/04/26 08:02:01 UTC
cvs commit: jakarta-james/src/org/apache/james/userrepository UsersFileRepository.java UsersLDAPRepository.java
donaldp 01/04/25 23:02:00
Modified: lib avalon-jmx.jar avalonapi.jar cornerstone.bar
phoenix-client.jar phoenix-engine.jar
phoenix-loader.jar
src/org/apache/james/imapserver FileMailbox.java
IMAPServer.java SimpleMessageAttributes.java
SingleThreadedConnectionHandler.java
src/org/apache/james/nntpserver NNTPHandler.java
NNTPServer.java
src/org/apache/james/nntpserver/repository
NNTPRepository.java NNTPSpooler.java NNTPUtil.java
src/org/apache/james/pop3server POP3Handler.java
POP3Server.java
src/org/apache/james/remotemanager RemoteManager.java
RemoteManagerHandler.java
src/org/apache/james/smtpserver SMTPHandler.java
SMTPServer.java SizeLimitedSMTPHandler.java
src/org/apache/james/transport JamesSpoolManager.java
LinearProcessor.java
src/org/apache/james/userrepository UsersFileRepository.java
UsersLDAPRepository.java
Log:
Synch to latest AvalonApi.jar.
Revision Changes Path
1.2 +29 -37 jakarta-james/lib/avalon-jmx.jar
<<Binary file>>
1.13 +231 -295 jakarta-james/lib/avalonapi.jar
<<Binary file>>
1.13 +131 -124 jakarta-james/lib/cornerstone.bar
<<Binary file>>
1.8 +16 -17 jakarta-james/lib/phoenix-client.jar
<<Binary file>>
1.8 +220 -207 jakarta-james/lib/phoenix-engine.jar
<<Binary file>>
1.8 +12 -12 jakarta-james/lib/phoenix-loader.jar
<<Binary file>>
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileMailbox.java 2001/04/19 04:06:42 1.6
+++ FileMailbox.java 2001/04/26 06:01:38 1.7
@@ -187,7 +187,7 @@
}
}
- public void init() throws Exception {
+ public void initialize() throws Exception {
uidValidity = 1;
highestUID = 0;
mailboxSize = 0;
@@ -261,7 +261,7 @@
*
* <p> Contract is that re-init must be called after configure, contextualize, compose.
*/
- public void reInit() throws Exception {
+ public void reinitialize() throws Exception {
listeners = new HashSet();
logger = LogKit.getLoggerFor("james.MailRepository");
logger.info("FileMailbox reInit for " + absoluteName);
@@ -993,7 +993,7 @@
throw new RuntimeException("Exception creating SimpleMessageAttributes: " + me);
}
Flags flags = new Flags();
- flags.init();
+ flags.initialize();
return store(message, username, attrs, flags);
}
@@ -1243,7 +1243,7 @@
try {
inAttrs = new ObjectInputStream( new FileInputStream(path + File.separator + uid + ATTRIBUTES_EXTENSION));
response = (SimpleMessageAttributes)inAttrs.readObject();
- response.reInit();
+ response.reinitialize();
} catch(Exception e) {
logger.error("Error reading attributes from disc: " + e);
e.printStackTrace();
1.12 +1 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- IMAPServer.java 2001/04/25 14:46:04 1.11
+++ IMAPServer.java 2001/04/26 06:01:38 1.12
@@ -36,7 +36,7 @@
public void configure( final Configuration configuration )
throws ConfigurationException {
- m_port = configuration.getChild( "port" ).getValueAsInt( 143 );
+ m_port = configuration.getChild( "port" ).getValueAsInteger( 143 );
try
{
1.5 +9 -9 jakarta-james/src/org/apache/james/imapserver/SimpleMessageAttributes.java
Index: SimpleMessageAttributes.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/imapserver/SimpleMessageAttributes.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleMessageAttributes.java 2001/03/06 07:39:13 1.4
+++ SimpleMessageAttributes.java 2001/04/26 06:01:39 1.5
@@ -22,16 +22,16 @@
/**
* Attributes of a Message in IMAP4rev1 style. Message
- * Attributes should be set when a message enters a mailbox.
+ * Attributes should be set when a message enters a mailbox.
* <p> Note that the message in a mailbox have the same order using either
* Message Sequence Numbers or UIDs.
- * <p> reInit() must be called on deserialization to reset Logger
+ * <p> reinitialize() must be called on deserialization to reset Logger
*
* Reference: RFC 2060 - para 2.3
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
* @version 0.1 on 14 Dec 2000
*/
-public class SimpleMessageAttributes
+public class SimpleMessageAttributes
implements MessageAttributes, Serializable {
private final static String SP = " ";
@@ -80,7 +80,7 @@
SimpleMessageAttributes() {
}
- void reInit() {
+ void reinitialize() {
logger = LogKit.getLoggerFor("james.JamesHost");
}
@@ -195,7 +195,7 @@
}
if (contentTypeLine !=null ) {
decodeContentType(contentTypeLine);
- }
+ }
try {
contentID = part.getContentID();
if (DEBUG) logger.debug("parseMessage - contentID: " + contentID);
@@ -250,7 +250,7 @@
SimpleMessageAttributes partAttrs = new SimpleMessageAttributes();
partAttrs.parseMimePart((MimePart)nextPart);
parts[i] = partAttrs;
-
+
} else {
logger.info("Found a non-Mime bodyPart");
}
@@ -439,7 +439,7 @@
}
return buf.toString();
}
-
+
/**
* Decode a content Type header line into types and parameters pairs
*/
@@ -543,7 +543,7 @@
logger.debug("Assembling bodyStructure for type MESSAGE/FRC822");
buf.append("\"MESSAGE\" \"RFC822\" ");
buf.append(fields + SP);
- ((SimpleMessageAttributes)parts[0]).reInit(); // reset transient logger
+ ((SimpleMessageAttributes)parts[0]).reinitialize(); // reset transient logger
buf.append(parts[0].getEnvelope() + SP);
buf.append(parts[0].getBodyStructure() + SP);
buf.append(lineCount);
@@ -551,7 +551,7 @@
logger.debug("Assembling bodystructure for type MULTIPART");
for (int i=0; i<parts.length; i++) {
logger.debug("Parsing part: " + i);
- ((SimpleMessageAttributes)parts[i]).reInit(); // reset transient logger
+ ((SimpleMessageAttributes)parts[i]).reinitialize(); // reset transient logger
buf.append(parts[i].getBodyStructure());
}
buf.append(SP + secondaryType);
1.15 +5 -5 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SingleThreadedConnectionHandler.java 2001/04/25 14:46:05 1.14
+++ SingleThreadedConnectionHandler.java 2001/04/26 06:01:39 1.15
@@ -13,7 +13,7 @@
import java.util.*;
import javax.mail.internet.*;
import org.apache.avalon.activity.Initializable;
-import org.apache.avalon.Stoppable;
+import org.apache.avalon.activity.Disposable;
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.Composable;
@@ -48,7 +48,7 @@
public class SingleThreadedConnectionHandler
extends BaseCommand
implements ConnectionHandler, Contextualizable, Composable, Configurable,
- Initializable, Stoppable, Target, MailboxEventListener {
+ Initializable, Disposable, Target, MailboxEventListener {
//mainly to switch on stack traces and catch responses;
private static final boolean DEEP_DEBUG = true;
@@ -147,7 +147,7 @@
lookup("org.apache.james.imapserver.Host");
}
- public void contextualize( final Context context )
+ public void contextualize( final Context context )
throws ContextException {
servername = (String)context.get( Constants.HELO_NAME );
if ( servername == null )
@@ -156,7 +156,7 @@
public void configure( final Configuration configuration )
throws ConfigurationException {
- timeout = configuration.getChild( "connectiontimeout" ).getValueAsInt( 1800000 );
+ timeout = configuration.getChild( "connectiontimeout" ).getValueAsInteger( 1800000 );
}
public void initialize() throws Exception {
@@ -1273,7 +1273,7 @@
} // end of parseCommand
- public void stop() {
+ public void dispose() {
// todo
getLogger().error("Stop IMAPHandler");
}
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NNTPHandler.java 2001/04/25 14:46:09 1.5
+++ NNTPHandler.java 2001/04/26 06:01:41 1.6
@@ -94,7 +94,7 @@
public void configure( Configuration configuration ) throws ConfigurationException {
//System.out.println(getClass().getName()+": configure");
//NNTPUtil.show(configuration,System.out);
- timeout = configuration.getChild( "connectiontimeout" ).getValueAsInt( 120000 );
+ timeout = configuration.getChild( "connectiontimeout" ).getValueAsInteger( 120000 );
authRequired=configuration.getChild("authRequired").getValueAsBoolean(false);
authState = new AuthState(authRequired,users);
}
1.5 +4 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NNTPServer.java 2001/04/23 01:14:31 1.4
+++ NNTPServer.java 2001/04/26 06:01:43 1.5
@@ -9,7 +9,7 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.activity.Initializable;
import org.apache.avalon.component.Component;
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.component.ComponentManager;
@@ -33,7 +33,7 @@
throws ConfigurationException
{
//System.out.println(getClass().getName()+": configure");
- m_port = configuration.getChild( "port" ).getValueAsInt( 119 );
+ m_port = configuration.getChild( "port" ).getValueAsInteger( 119 );
try {
String bindAddress = configuration.getChild( "bind" ).getValue( null );
@@ -51,9 +51,9 @@
getLogger().info("configured NNTPServer to run at : "+m_port);
}
- public void init() throws Exception {
+ public void initialize() throws Exception {
//System.out.println(getClass().getName()+": init");
- super.init();
+ super.initialize();
System.out.println("Started NNTP Server "+m_connectionName);
}
}
1.4 +1 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPRepository.java 2001/04/19 04:06:57 1.3
+++ NNTPRepository.java 2001/04/26 06:01:44 1.4
@@ -9,7 +9,7 @@
import java.io.*;
import java.util.*;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.activity.Initializable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
1.5 +4 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NNTPSpooler.java 2001/04/21 21:27:42 1.4
+++ NNTPSpooler.java 2001/04/26 06:01:45 1.5
@@ -10,7 +10,7 @@
import java.io.*;
import java.util.*;
import javax.mail.internet.MimeMessage;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.activity.Initializable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -28,8 +28,8 @@
//System.out.println(getClass().getName()+": configure");
//NNTPUtil.show(configuration,System.out);
spoolPath = NNTPUtil.getDirectory(configuration,"spoolPath");
- int threadCount = configuration.getChild("threadCount").getValueAsInt(1);
- int threadIdleTime = configuration.getChild("threadIdleTime").getValueAsInt(1000);
+ int threadCount = configuration.getChild("threadCount").getValueAsInteger(1);
+ int threadIdleTime = configuration.getChild("threadIdleTime").getValueAsInteger(1000);
//String tgName=configuration.getChild("threadGroupName").getValue("NNTPSpooler");
worker = new Worker[threadCount];
for ( int i = 0 ; i < worker.length ; i++ ) {
@@ -51,7 +51,7 @@
spoolPath.mkdirs();
return spoolPath;
}
- public void init() throws Exception {
+ public void initialize() throws Exception {
//System.out.println(getClass().getName()+": init");
for ( int i = 0 ; i < worker.length ; i++ )
new Thread(worker[i],"NNTPSpool-"+i).start();
1.4 +1 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPUtil.java 2001/04/21 21:27:43 1.3
+++ NNTPUtil.java 2001/04/26 06:01:45 1.4
@@ -8,7 +8,7 @@
package org.apache.james.nntpserver.repository;
import java.io.*;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.activity.Initializable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
1.43 +1 -1 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- POP3Handler.java 2001/04/25 14:46:13 1.42
+++ POP3Handler.java 2001/04/26 06:01:48 1.43
@@ -90,7 +90,7 @@
public void configure( final Configuration configuration )
throws ConfigurationException {
- timeout = configuration.getChild( "connectiontimeout" ).getValueAsInt( 120000 );
+ timeout = configuration.getChild( "connectiontimeout" ).getValueAsInteger( 120000 );
}
public void compose( final ComponentManager componentManager )
1.22 +3 -3 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- POP3Server.java 2001/04/23 01:14:34 1.21
+++ POP3Server.java 2001/04/26 06:01:49 1.22
@@ -30,7 +30,7 @@
public void configure( final Configuration configuration )
throws ConfigurationException {
- m_port = configuration.getChild( "port" ).getValueAsInt( 25 );
+ m_port = configuration.getChild( "port" ).getValueAsInteger( 25 );
try
{
@@ -51,11 +51,11 @@
super.configure( configuration.getChild( "pop3handler" ) );
}
- public void init() throws Exception {
+ public void initialize() throws Exception {
getLogger().info( "POP3Server init..." );
getLogger().info( "POP3Listener using " + m_serverSocketType + " on port " + m_port );
- super.init();
+ super.initialize();
getLogger().info( "POP3Server ...init end" );
System.out.println("Started POP3 Server "+m_connectionName);
}
1.25 +3 -3 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- RemoteManager.java 2001/03/06 03:16:28 1.24
+++ RemoteManager.java 2001/04/26 06:01:51 1.25
@@ -36,7 +36,7 @@
public void configure( final Configuration configuration )
throws ConfigurationException {
- m_port = configuration.getChild( "port" ).getValueAsInt( 4554 );
+ m_port = configuration.getChild( "port" ).getValueAsInteger( 4554 );
try
{
@@ -57,11 +57,11 @@
super.configure( configuration );
}
- public void init() throws Exception {
+ public void initialize() throws Exception {
getLogger().info( "RemoteManager init..." );
getLogger().info( "RemoteManager using " + m_serverSocketType + " on port " + m_port );
- super.init();
+ super.initialize();
getLogger().info("RemoteManager ...init end");
}
}
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RemoteManagerHandler.java 2001/04/20 13:58:01 1.6
+++ RemoteManagerHandler.java 2001/04/26 06:01:52 1.7
@@ -56,7 +56,7 @@
public void configure( final Configuration configuration )
throws ConfigurationException {
- timeout = configuration.getChild( "connectiontimeout" ).getValueAsInt( 120000 );
+ timeout = configuration.getChild( "connectiontimeout" ).getValueAsInteger( 120000 );
final Configuration admin = configuration.getChild( "administrator_accounts" );
final Configuration[] accounts = admin.getChildren( "account" );
1.36 +1 -1 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- SMTPHandler.java 2001/04/25 14:46:15 1.35
+++ SMTPHandler.java 2001/04/26 06:01:53 1.36
@@ -78,7 +78,7 @@
public void configure(Configuration conf) throws ConfigurationException {
this.conf = conf;
- timeout = conf.getChild( "connectiontimeout" ).getValueAsInt( 120000 );
+ timeout = conf.getChild( "connectiontimeout" ).getValueAsInteger( 120000 );
}
public void contextualize( final Context context )
1.23 +3 -3 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SMTPServer.java 2001/04/23 01:14:37 1.22
+++ SMTPServer.java 2001/04/26 06:01:53 1.23
@@ -33,7 +33,7 @@
public void configure( final Configuration configuration )
throws ConfigurationException {
- m_port = configuration.getChild( "port" ).getValueAsInt( 25 );
+ m_port = configuration.getChild( "port" ).getValueAsInteger( 25 );
try
{
@@ -54,9 +54,9 @@
super.configure( configuration.getChild( "smtphandler" ) );
}
- public void init() throws Exception {
+ public void initialize() throws Exception {
getLogger().info("SMTPServer init...");
- super.init();
+ super.initialize();
getLogger().info("SMTPServer ...init end");
System.out.println("Started SMTP Server "+m_connectionName);
}
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SizeLimitedSMTPHandler.java 2001/04/25 14:46:15 1.5
+++ SizeLimitedSMTPHandler.java 2001/04/26 06:01:54 1.6
@@ -95,7 +95,7 @@
public void configure(Configuration conf) throws ConfigurationException {
this.conf = conf;
- timeout = conf.getChild( "connectiontimeout" ).getValueAsInt( 120000 );
+ timeout = conf.getChild( "connectiontimeout" ).getValueAsInteger( 120000 );
// get the message size limit from the conf file and multiply
//by 1024, to put it in bytes
maxmessagesize =
1.31 +7 -7 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- JamesSpoolManager.java 2001/04/21 21:27:46 1.30
+++ JamesSpoolManager.java 2001/04/26 06:01:56 1.31
@@ -11,8 +11,8 @@
import java.net.*;
import java.util.*;
import javax.mail.MessagingException;
-import org.apache.avalon.Initializable;
-import org.apache.avalon.Stoppable;
+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;
@@ -37,7 +37,7 @@
*/
public class JamesSpoolManager
extends AbstractLoggable
- implements Composable, Configurable, Initializable, Runnable, Stoppable, Contextualizable, Block {
+ implements Composable, Configurable, Initializable, Runnable, Disposable, Contextualizable, Block {
private DefaultComponentManager compMgr;
//using implementation as we need put method.
@@ -52,7 +52,7 @@
public void configure(Configuration conf) throws ConfigurationException {
this.conf = conf;
- threads = conf.getChild("threads").getValueAsInt(1);
+ threads = conf.getChild("threads").getValueAsInteger(1);
}
public void contextualize(Context context) {
@@ -64,7 +64,7 @@
compMgr = new DefaultComponentManager(comp);
}
- public void init() throws Exception {
+ public void initialize() throws Exception {
getLogger().info("JamesSpoolManager init...");
workerPool = blockContext.getThreadPool( "default" );
@@ -107,7 +107,7 @@
LinearProcessor processor = new LinearProcessor();
processor.setSpool(spool);
processor.setLogger( getLogger() );
- processor.init();
+ processor.initialize();
processors.put(processorName, processor);
//If this is the root processor, add the PostmasterAlias mailet silently
@@ -227,5 +227,5 @@
}
}
- public void stop() {}
+ public void dispose() {}
}
1.17 +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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LinearProcessor.java 2001/04/19 04:07:05 1.16
+++ LinearProcessor.java 2001/04/26 06:01:56 1.17
@@ -11,7 +11,7 @@
import java.util.*;
import javax.mail.*;
import org.apache.avalon.logger.Loggable;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.activity.Initializable;
import org.apache.james.*;
import org.apache.james.core.*;
import org.apache.james.services.SpoolRepository;
@@ -56,7 +56,7 @@
}
- public void init() {
+ public void initialize() {
this.matchers = new Vector();
this.mailets = new Vector();
tempUnprocessed = new Vector();
1.11 +3 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UsersFileRepository.java 2001/04/19 04:07:29 1.10
+++ UsersFileRepository.java 2001/04/26 06:01:58 1.11
@@ -9,7 +9,7 @@
import java.io.File;
import java.util.Iterator;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.activity.Initializable;
import org.apache.avalon.component.Component;
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.component.ComponentManager;
@@ -39,8 +39,7 @@
*/
public class UsersFileRepository
extends AbstractLoggable
- implements UsersRepository, Component, Configurable, Composable,
- Initializable {
+ implements UsersRepository, Component, Configurable, Composable, Initializable {
private static final String TYPE = "USERS";
@@ -66,7 +65,7 @@
lookup( "org.apache.cornerstone.services.store.Store" );
}
- public void init()
+ public void initialize()
throws Exception {
try {
1.9 +2 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UsersLDAPRepository.java 2001/04/25 14:46:17 1.8
+++ UsersLDAPRepository.java 2001/04/26 06:01:59 1.9
@@ -11,7 +11,7 @@
import java.util.*;
import javax.naming.*;
import javax.naming.directory.*;
-import org.apache.avalon.Initializable;
+import org.apache.avalon.activity.Initializable;
import org.apache.avalon.component.ComponentManager;
import org.apache.avalon.component.Composable;
import org.apache.avalon.configuration.Configurable;
@@ -106,7 +106,7 @@
baseNodeDN = base;
}
- public void init() throws Exception {
+ public void initialize() throws Exception {
//setServerRoot();
rootURL = LDAPHost + "/" + rootNodeDN;
baseURL = LDAPHost + "/" + baseNodeDN;
---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org