james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r684545 - in /james/server/trunk: avalon-socket-library/src/main/java/org/apache/james/core/ avalon-socket-library/src/main/java/org/apache/james/services/ avalon-socket-library/src/main/java/org/apache/james/socket/ avalon-socket-library/s...
Date Sun, 10 Aug 2008 16:24:38 GMT
Author: bago
Date: Sun Aug 10 09:24:35 2008
New Revision: 684545

URL: http://svn.apache.org/viewvc?rev=684545&view=rev
Log:
Repackaging avalon-socket-library classes.
Moved o.a.j.core.* and o.a.j.services.* to a "local" o.a.j.socket package.

Added:
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesHandler.java   (contents, props changed)
      - copied, changed from r684535, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java   (contents, props changed)
      - copied, changed from r684533, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java   (contents, props changed)
      - copied, changed from r684535, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CRLFTerminatedReader.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CopyInputStream.java
      - copied, changed from r684533, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CopyInputStream.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionManager.java   (contents, props changed)
      - copied, changed from r684533, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SplitOutputStream.java
      - copied, changed from r684533, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/SplitOutputStream.java
Removed:
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/
Modified:
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.xinfo
    james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java
    james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java
    james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo
    james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
    james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
    james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo
    james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
    james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
    james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo
    james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
    james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
    james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
    james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
    james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo
    james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
    james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
    james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo
    james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
    james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
    james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
    james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesHandler.java (from r684535, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesHandler.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesHandler.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java&r1=684535&r2=684545&rev=684545&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesHandler.java Sun Aug 10 09:24:35 2008
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.core;
+package org.apache.james.socket;
 
 import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
 import org.apache.avalon.excalibur.pool.Poolable;

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java (from r684533, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java&r1=684533&r2=684545&rev=684545&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java Sun Aug 10 09:24:35 2008
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.core;
+package org.apache.james.socket;
 
 import org.apache.avalon.cornerstone.services.connection.AbstractHandlerFactory;
 import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
@@ -44,7 +44,6 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.excalibur.thread.ThreadPool;
 import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.services.JamesConnectionManager;
 import org.apache.james.util.watchdog.ThreadPerWatchdogFactory;
 import org.apache.james.util.watchdog.Watchdog;
 import org.apache.james.util.watchdog.WatchdogFactory;

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4.4.6

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java (from r684535, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CRLFTerminatedReader.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CRLFTerminatedReader.java&r1=684535&r2=684545&rev=684545&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CRLFTerminatedReader.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java Sun Aug 10 09:24:35 2008
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.core;
+package org.apache.james.socket;
 
 import java.io.InputStream;
 import java.io.Reader;

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1.2.2

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFTerminatedReader.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CopyInputStream.java (from r684533, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CopyInputStream.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CopyInputStream.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CopyInputStream.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CopyInputStream.java&r1=684533&r2=684545&rev=684545&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CopyInputStream.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CopyInputStream.java Sun Aug 10 09:24:35 2008
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.core;
+package org.apache.james.socket;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionManager.java (from r684533, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionManager.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionManager.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java&r1=684533&r2=684545&rev=684545&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionManager.java Sun Aug 10 09:24:35 2008
@@ -20,7 +20,7 @@
 
 
 
-package org.apache.james.services;
+package org.apache.james.socket;
 
 
 import org.apache.avalon.cornerstone.services.connection.ConnectionManager;

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionManager.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SplitOutputStream.java (from r684533, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/SplitOutputStream.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SplitOutputStream.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SplitOutputStream.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/SplitOutputStream.java&r1=684533&r2=684545&rev=684545&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/SplitOutputStream.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SplitOutputStream.java Sun Aug 10 09:24:35 2008
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.core;
+package org.apache.james.socket;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.java Sun Aug 10 09:24:35 2008
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import org.apache.excalibur.thread.ThreadPool;
 import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.james.services.JamesConnectionManager;
+import org.apache.james.socket.JamesConnectionManager;
 import org.apache.avalon.cornerstone.services.threads.ThreadManager;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -293,7 +293,7 @@
     
   
     /**
-     * @see org.apache.james.services.JamesConnectionManager#connect(java.lang.String, java.net.ServerSocket, org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory, org.apache.excalibur.thread.ThreadPool, int)
+     * @see org.apache.james.socket.JamesConnectionManager#connect(java.lang.String, java.net.ServerSocket, org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory, org.apache.excalibur.thread.ThreadPool, int)
      */
     public void connect(String name, ServerSocket socket, ConnectionHandlerFactory handlerFactory, ThreadPool threadPool, int maxOpenConnections) throws Exception {
         connect(name,socket,handlerFactory,threadPool,maxOpenConnections,maxOpenConnPerIP);
@@ -301,7 +301,7 @@
   
     
     /**
-     * @see org.apache.james.services.JamesConnectionManager#connect(java.lang.String, java.net.ServerSocket, org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory, int, int)
+     * @see org.apache.james.socket.JamesConnectionManager#connect(java.lang.String, java.net.ServerSocket, org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory, int, int)
      */
     public void connect(String name, ServerSocket socket, ConnectionHandlerFactory handlerFactory, int maxOpenConnections,int maxOpenConnectionsPerIP) throws Exception {
         connect(name,socket,handlerFactory,threadManager.getDefaultThreadPool(),maxOpenConnections,maxOpenConnectionsPerIP);
@@ -320,7 +320,7 @@
     
     
     /**
-     * @see org.apache.james.services.JamesConnectionManager#getMaximumNumberOfOpenConnectionsPerIP()
+     * @see org.apache.james.socket.JamesConnectionManager#getMaximumNumberOfOpenConnectionsPerIP()
      */
     public int getMaximumNumberOfOpenConnectionsPerIP() {
         return maxOpenConnPerIP;

Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.xinfo?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.xinfo (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.xinfo Sun Aug 10 09:24:35 2008
@@ -29,7 +29,7 @@
 
   <!-- services that are offered by this block -->
   <services>
-    <service name="org.apache.james.services.JamesConnectionManager"/>
+    <service name="org.apache.james.socket.JamesConnectionManager"/>
   </services>
 
   <!-- services that are required by this block -->

Modified: james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java (original)
+++ james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java Sun Aug 10 09:24:35 2008
@@ -29,12 +29,12 @@
 import org.apache.james.api.imap.ImapConstants;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.core.AbstractJamesHandler;
 import org.apache.james.experimental.imapserver.encode.writer.OutputStreamImapResponseWriter;
 import org.apache.james.imapserver.codec.decode.ImapDecoder;
 import org.apache.james.imapserver.codec.encode.ImapEncoder;
 import org.apache.james.imapserver.codec.encode.ImapResponseComposer;
 import org.apache.james.imapserver.codec.encode.base.ImapResponseComposerImpl;
+import org.apache.james.socket.AbstractJamesHandler;
 
 /**
  * Handles IMAP connections.

Modified: james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java (original)
+++ james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.java Sun Aug 10 09:24:35 2008
@@ -26,12 +26,12 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.api.imap.process.ImapProcessor;
 import org.apache.james.api.imap.process.ImapProcessorFactory;
-import org.apache.james.core.AbstractJamesService;
 import org.apache.james.imapserver.codec.decode.ImapDecoder;
 import org.apache.james.imapserver.codec.decode.ImapDecoderFactory;
 import org.apache.james.imapserver.codec.encode.ImapEncoder;
 import org.apache.james.imapserver.codec.encode.ImapEncoderFactory;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.AbstractJamesService;
 
 /**
  * TODO: this is a quick cut-and-paste hack from POP3Server. Should probably be

Modified: james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo (original)
+++ james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapServer.xinfo Sun Aug 10 09:24:35 2008
@@ -27,7 +27,7 @@
 
   <dependencies>
     <dependency>
-      <service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
+      <service name="org.apache.james.socket.JamesConnectionManager" version="1.0"/>
     </dependency>
     <dependency>
       <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>

Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java Sun Aug 10 09:24:35 2008
@@ -23,8 +23,8 @@
 import org.apache.avalon.excalibur.pool.Poolable;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.Constants;
-import org.apache.james.core.AbstractJamesHandler;
 import org.apache.james.mailboxmanager.MailboxManagerException;
+import org.apache.james.socket.AbstractJamesHandler;
 
 import java.io.IOException;
 import java.net.Socket;

Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java Sun Aug 10 09:24:35 2008
@@ -25,9 +25,9 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.api.user.UsersRepository;
-import org.apache.james.core.AbstractJamesService;
 import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.AbstractJamesService;
 
 /**
  * TODO: this is a quick cut-and-paste hack from POP3Server. Should probably be

Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.xinfo Sun Aug 10 09:24:35 2008
@@ -32,7 +32,7 @@
       <service name="org.apache.james.api.user.UsersRepository" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
+      <service name="org.apache.james.socket.JamesConnectionManager" version="1.0"/>
     </dependency>
     <dependency>
       <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>

Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPHandler.java Sun Aug 10 09:24:35 2008
@@ -21,10 +21,10 @@
 
 package org.apache.james.nntpserver;
 
-import org.apache.james.core.AbstractJamesHandler;
 import org.apache.james.core.MailHeaders;
 import org.apache.james.nntpserver.repository.NNTPArticle;
 import org.apache.james.nntpserver.repository.NNTPGroup;
+import org.apache.james.socket.AbstractJamesHandler;
 import org.apache.james.util.stream.CharTerminatedInputStream;
 import org.apache.james.util.stream.DotStuffingInputStream;
 import org.apache.james.util.stream.ExtraDotOutputStream;
@@ -250,7 +250,7 @@
     boolean isAlreadyAuthenticated = false;
 
     /**
-     * @see org.apache.james.core.AbstractJamesHandler#setConfigurationData(Object)
+     * @see org.apache.james.socket.AbstractJamesHandler#setConfigurationData(Object)
      */
     public void setConfigurationData(Object theData) {
         if (theData instanceof NNTPHandlerConfigurationData) {
@@ -261,7 +261,7 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesHandler#handleProtocol()
+     * @see org.apache.james.socket.AbstractJamesHandler#handleProtocol()
      */
     protected void handleProtocol() throws IOException {
         // section 7.1
@@ -291,7 +291,7 @@
     }
     
     /**
-     * @see org.apache.james.core.AbstractJamesHandler#errorHandler(java.lang.RuntimeException)
+     * @see org.apache.james.socket.AbstractJamesHandler#errorHandler(java.lang.RuntimeException)
      */
     protected void errorHandler(RuntimeException e) {
         super.errorHandler(e);
@@ -307,7 +307,7 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesHandler#resetHandler
+     * @see org.apache.james.socket.AbstractJamesHandler#resetHandler
      */
     protected void resetHandler() {
         // Clear the selected group, article info

Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java Sun Aug 10 09:24:35 2008
@@ -26,9 +26,9 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.api.user.UsersRepository;
-import org.apache.james.core.AbstractJamesService;
 import org.apache.james.nntpserver.repository.NNTPRepository;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.AbstractJamesService;
 
 /**
  * NNTP Server
@@ -117,14 +117,14 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getDefaultPort()
+     * @see org.apache.james.socket.AbstractJamesService#getDefaultPort()
      */
      protected int getDefaultPort() {
         return 119;
      }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getServiceType()
+     * @see org.apache.james.socket.AbstractJamesService#getServiceType()
      */
     public String getServiceType() {
         return "NNTP Service";
@@ -187,7 +187,7 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getConfigurationData()
+     * @see org.apache.james.socket.AbstractJamesService#getConfigurationData()
      */
     protected Object getConfigurationData() {
         return theConfigData;

Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.xinfo Sun Aug 10 09:24:35 2008
@@ -31,7 +31,7 @@
 
   <dependencies>
     <dependency>
-      <service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
+      <service name="org.apache.james.socket.JamesConnectionManager" version="1.0"/>
     </dependency>
     <dependency>
       <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>

Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Sun Aug 10 09:24:35 2008
@@ -104,7 +104,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -136,7 +136,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="imap-connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -151,7 +151,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -166,7 +166,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -183,7 +183,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="nntp-repository"
              role="org.apache.james.nntpserver.repository.NNTPRepository"/>
     <provide name="thread-manager"

Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java Sun Aug 10 09:24:35 2008
@@ -27,8 +27,8 @@
 import org.apache.james.api.dnsservice.DNSService;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.core.MailImpl;
-import org.apache.james.services.JamesConnectionManager;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.JamesConnectionManager;
 import org.apache.james.test.mock.avalon.MockLogger;
 import org.apache.james.test.mock.avalon.MockServiceManager;
 import org.apache.james.test.mock.avalon.MockSocketManager;

Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java Sun Aug 10 09:24:35 2008
@@ -23,10 +23,10 @@
 
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.james.Constants;
-import org.apache.james.core.AbstractJamesHandler;
-import org.apache.james.core.CRLFTerminatedReader;
 import org.apache.james.core.MailImpl;
 import org.apache.james.services.MailRepository;
+import org.apache.james.socket.AbstractJamesHandler;
+import org.apache.james.socket.CRLFTerminatedReader;
 import org.apache.james.util.watchdog.Watchdog;
 import org.apache.mailet.Mail;
 
@@ -167,7 +167,7 @@
     }
     
     /**
-     * @see org.apache.james.core.AbstractJamesHandler#handleProtocol()
+     * @see org.apache.james.socket.AbstractJamesHandler#handleProtocol()
      */
     protected void handleProtocol() throws IOException {
         handlerState = AUTHENTICATION_READY;
@@ -264,7 +264,7 @@
     }
     
     /**
-     * @see org.apache.james.core.AbstractJamesHandler#errorHandler(java.lang.RuntimeException)
+     * @see org.apache.james.socket.AbstractJamesHandler#errorHandler(java.lang.RuntimeException)
      */
     protected void errorHandler(RuntimeException e) {
         super.errorHandler(e);

Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java Sun Aug 10 09:24:35 2008
@@ -27,8 +27,8 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.james.api.user.UsersRepository;
-import org.apache.james.core.AbstractJamesService;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.AbstractJamesService;
 
 /**
  * <p>Accepts POP3 connections on a server socket and dispatches them to POP3Handlers.</p>
@@ -121,14 +121,14 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getDefaultPort()
+     * @see org.apache.james.socket.AbstractJamesService#getDefaultPort()
      */
      protected int getDefaultPort() {
         return 110;
      }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getServiceType()
+     * @see org.apache.james.socket.AbstractJamesService#getServiceType()
      */
     public String getServiceType() {
         return "POP3 Service";
@@ -194,7 +194,7 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getConfigurationData()
+     * @see org.apache.james.socket.AbstractJamesService#getConfigurationData()
      */
     protected Object getConfigurationData() {
         return theConfigData;

Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.xinfo Sun Aug 10 09:24:35 2008
@@ -34,7 +34,7 @@
       <service name="org.apache.james.api.user.UsersRepository" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
+      <service name="org.apache.james.socket.JamesConnectionManager" version="1.0"/>
     </dependency>
     <dependency>
       <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>

Modified: james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java Sun Aug 10 09:24:35 2008
@@ -29,9 +29,9 @@
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.core.MailImpl;
 import org.apache.james.services.AbstractDNSServer;
-import org.apache.james.services.JamesConnectionManager;
 import org.apache.james.services.MailRepository;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.JamesConnectionManager;
 import org.apache.james.test.mock.avalon.MockLogger;
 import org.apache.james.test.mock.avalon.MockServiceManager;
 import org.apache.james.test.mock.avalon.MockSocketManager;

Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java Sun Aug 10 09:24:35 2008
@@ -31,12 +31,12 @@
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.user.UsersStore;
 import org.apache.james.api.vut.management.VirtualUserTableManagementService;
-import org.apache.james.core.AbstractJamesService;
 import org.apache.james.services.BayesianAnalyzerManagementService;
 import org.apache.james.services.DomainListManagementService;
 import org.apache.james.services.MailServer;
 import org.apache.james.services.ProcessorManagementService;
 import org.apache.james.services.SpoolManagementService;
+import org.apache.james.socket.AbstractJamesService;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -273,14 +273,14 @@
     }
     
     /**
-     * @see org.apache.james.core.AbstractJamesService#getDefaultPort()
+     * @see org.apache.james.socket.AbstractJamesService#getDefaultPort()
      */
      protected int getDefaultPort() {
         return 4555;
      }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getServiceType()
+     * @see org.apache.james.socket.AbstractJamesService#getServiceType()
      */
     public String getServiceType() {
         return "Remote Manager Service";
@@ -401,7 +401,7 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getConfigurationData()
+     * @see org.apache.james.socket.AbstractJamesService#getConfigurationData()
      */
     protected Object getConfigurationData() {
         return theConfigData;

Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.xinfo Sun Aug 10 09:24:35 2008
@@ -40,7 +40,7 @@
       <service name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
+      <service name="org.apache.james.socket.JamesConnectionManager" version="1.0"/>
     </dependency>
     <dependency>
       <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>

Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java Sun Aug 10 09:24:35 2008
@@ -39,11 +39,11 @@
 import org.apache.james.api.user.User;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.vut.management.VirtualUserTableManagementException;
-import org.apache.james.core.AbstractJamesHandler;
 import org.apache.james.management.BayesianAnalyzerManagementException;
 import org.apache.james.management.DomainListManagementException;
 import org.apache.james.management.SpoolFilter;
 import org.apache.james.services.ProcessorManagementService;
+import org.apache.james.socket.AbstractJamesHandler;
 import org.apache.mailet.MailAddress;
 
 
@@ -203,7 +203,7 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesHandler#errorHandler(java.lang.RuntimeException)
+     * @see org.apache.james.socket.AbstractJamesHandler#errorHandler(java.lang.RuntimeException)
      */
     protected void errorHandler(RuntimeException e) {
         out.println("Unexpected Error: "+e.getMessage());

Modified: james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java Sun Aug 10 09:24:35 2008
@@ -35,8 +35,8 @@
 import org.apache.james.management.DomainListManagement;
 import org.apache.james.services.AbstractDNSServer;
 import org.apache.james.services.DomainListManagementService;
-import org.apache.james.services.JamesConnectionManager;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.JamesConnectionManager;
 import org.apache.james.test.mock.avalon.MockLogger;
 import org.apache.james.test.mock.avalon.MockServiceManager;
 import org.apache.james.test.mock.avalon.MockSocketManager;

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java Sun Aug 10 09:24:35 2008
@@ -23,8 +23,8 @@
 
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.james.Constants;
-import org.apache.james.core.AbstractJamesHandler;
-import org.apache.james.core.CRLFTerminatedReader;
+import org.apache.james.socket.AbstractJamesHandler;
+import org.apache.james.socket.CRLFTerminatedReader;
 import org.apache.james.util.watchdog.Watchdog;
 import org.apache.mailet.Mail;
 import org.apache.mailet.dates.RFC822DateFormat;
@@ -176,7 +176,7 @@
     }
     
     /**
-     * @see org.apache.james.core.AbstractJamesHandler#handleProtocol()
+     * @see org.apache.james.socket.AbstractJamesHandler#handleProtocol()
      */
     protected void handleProtocol() throws IOException {
         smtpID = random.nextInt(1024) + "";

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java Sun Aug 10 09:24:35 2008
@@ -29,8 +29,8 @@
 import org.apache.james.Constants;
 import org.apache.james.api.dnsservice.DNSService;
 import org.apache.james.api.user.UsersRepository;
-import org.apache.james.core.AbstractJamesService;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.AbstractJamesService;
 import org.apache.james.util.dnsservice.NetMatcher;
 import org.apache.mailet.MailetContext;
 
@@ -251,7 +251,7 @@
     }
     
     /**
-     * @see org.apache.james.core.AbstractJamesService#initialize()
+     * @see org.apache.james.socket.AbstractJamesService#initialize()
      */
     public void initialize() throws Exception {
         super.initialize();
@@ -259,14 +259,14 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getDefaultPort()
+     * @see org.apache.james.socket.AbstractJamesService#getDefaultPort()
      */
      protected int getDefaultPort() {
         return 25;
      }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getServiceType()
+     * @see org.apache.james.socket.AbstractJamesService#getServiceType()
      */
     public String getServiceType() {
         return "SMTP Service";
@@ -403,7 +403,7 @@
     }
 
     /**
-     * @see org.apache.james.core.AbstractJamesService#getConfigurationData()
+     * @see org.apache.james.socket.AbstractJamesService#getConfigurationData()
      */
     protected Object getConfigurationData() {
         return theConfigData;

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.xinfo Sun Aug 10 09:24:35 2008
@@ -40,7 +40,7 @@
       <service name="org.apache.james.api.dnsservice.DNSService" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.JamesConnectionManager" version="1.0"/>
+      <service name="org.apache.james.socket.JamesConnectionManager" version="1.0"/>
     </dependency>
     <dependency>
       <service name="org.apache.avalon.cornerstone.services.sockets.SocketManager" version="1.0"/>

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Sun Aug 10 09:24:35 2008
@@ -27,8 +27,8 @@
 import org.apache.commons.net.smtp.SMTPReply;
 import org.apache.james.api.dnsservice.DNSService;
 import org.apache.james.api.user.UsersRepository;
-import org.apache.james.services.JamesConnectionManager;
 import org.apache.james.services.MailServer;
+import org.apache.james.socket.JamesConnectionManager;
 import org.apache.james.test.mock.avalon.MockLogger;
 import org.apache.james.test.mock.avalon.MockServiceManager;
 import org.apache.james.test.mock.avalon.MockSocketManager;

Modified: james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml Sun Aug 10 09:24:35 2008
@@ -104,7 +104,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -136,7 +136,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="imap-connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -151,7 +151,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -166,7 +166,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -183,7 +183,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="nntp-repository"
              role="org.apache.james.nntpserver.repository.NNTPRepository"/>
     <provide name="thread-manager"

Modified: james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml?rev=684545&r1=684544&r2=684545&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml (original)
+++ james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml Sun Aug 10 09:24:35 2008
@@ -119,7 +119,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -151,7 +151,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="imap-connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -166,7 +166,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -181,7 +181,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="James" role="org.apache.james.services.MailServer"/>
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -198,7 +198,7 @@
     <provide name="sockets"
              role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
     <provide name="connections"
-             role="org.apache.james.services.JamesConnectionManager"/>
+             role="org.apache.james.socket.JamesConnectionManager"/>
     <provide name="nntp-repository"
              role="org.apache.james.nntpserver.repository.NNTPRepository"/>
     <provide name="thread-manager"



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message