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 rd...@apache.org on 2009/08/19 12:43:30 UTC
svn commit: r805741 - in /james/server/trunk:
avalon-socket-library/src/main/java/org/apache/james/socket/
avalon-socket-library/src/main/java/org/apache/james/util/
avalon-socket-library/src/main/java/org/apache/james/util/connection/
avalon-socket-li...
Author: rdonkin
Date: Wed Aug 19 10:43:28 2009
New Revision: 805741
URL: http://svn.apache.org/viewvc?rev=805741&view=rev
Log:
Consolidate sockets into one package
Added:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesReadResetInputStream.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesWrittenResetOutputStream.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFDelimitedByteBuffer.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFDelimitedByteBuffer.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ConnectionPerIpMap.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ConnectionPerIpMap.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/SchedulerWatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ServerConnection.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ServerConnection.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java
- copied, changed from r805711, 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/socket/ThreadPerWatchdogFactory.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/Watchdog.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogTarget.java
- copied, changed from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogTarget.java
james/server/trunk/avalon-socket-library/src/main/resources/org/apache/james/socket/
james/server/trunk/avalon-socket-library/src/main/resources/org/apache/james/socket/SimpleConnectionManager.xinfo
- copied unchanged from r805711, james/server/trunk/avalon-socket-library/src/main/resources/org/apache/james/util/connection/SimpleConnectionManager.xinfo
Removed:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFDelimitedByteBuffer.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ConnectionPerIpMap.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ServerConnection.java
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/watchdog/BytesReadResetInputStream.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesWrittenResetOutputStream.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/SchedulerWatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/Watchdog.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogTarget.java
james/server/trunk/avalon-socket-library/src/main/resources/org/apache/james/util/
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
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/POP3Session.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.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/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java?rev=805741&r1=805740&r2=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractJamesService.java Wed Aug 19 10:43:28 2009
@@ -44,9 +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.util.watchdog.ThreadPerWatchdogFactory;
-import org.apache.james.util.watchdog.Watchdog;
-import org.apache.james.util.watchdog.WatchdogFactory;
import java.net.BindException;
import java.net.InetAddress;
@@ -803,7 +800,7 @@
protected abstract ProtocolHandler newProtocolHandlerInstance();
- /**
+ /**
* @see org.apache.avalon.excalibur.pool.ObjectFactory#getCreatedClass()
*/
public Class getCreatedClass() {
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesReadResetInputStream.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesReadResetInputStream.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesReadResetInputStream.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java Wed Aug 19 10:43:28 2009
@@ -19,7 +19,7 @@
-package org.apache.james.util.watchdog;
+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/BytesWrittenResetOutputStream.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesWrittenResetOutputStream.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesWrittenResetOutputStream.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/BytesWrittenResetOutputStream.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java Wed Aug 19 10:43:28 2009
@@ -19,7 +19,7 @@
-package org.apache.james.util.watchdog;
+package org.apache.james.socket;
import java.io.IOException;
import java.io.OutputStream;
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFDelimitedByteBuffer.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFDelimitedByteBuffer.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFDelimitedByteBuffer.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFDelimitedByteBuffer.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFDelimitedByteBuffer.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFDelimitedByteBuffer.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/CRLFDelimitedByteBuffer.java Wed Aug 19 10:43:28 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util;
+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/ConnectionPerIpMap.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ConnectionPerIpMap.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ConnectionPerIpMap.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ConnectionPerIpMap.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ConnectionPerIpMap.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ConnectionPerIpMap.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ConnectionPerIpMap.java Wed Aug 19 10:43:28 2009
@@ -20,7 +20,7 @@
-package org.apache.james.util.connection;
+package org.apache.james.socket;
import java.util.HashMap;
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java?rev=805741&r1=805740&r2=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/DelegatingJamesHandler.java Wed Aug 19 10:43:28 2009
@@ -38,8 +38,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.util.InternetPrintWriter;
-import org.apache.james.util.watchdog.Watchdog;
-import org.apache.james.util.watchdog.WatchdogTarget;
/**
* Common Handler code
@@ -397,7 +395,7 @@
implements WatchdogTarget {
/**
- * @see org.apache.james.util.watchdog.WatchdogTarget#execute()
+ * @see org.apache.james.socket.WatchdogTarget#execute()
*/
public void execute() {
DelegatingJamesHandler.this.idleClose();
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java Wed Aug 19 10:43:28 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util.watchdog;
+package org.apache.james.socket;
import org.apache.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.activity.Disposable;
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java?rev=805741&r1=805740&r2=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerHelper.java Wed Aug 19 10:43:28 2009
@@ -21,7 +21,6 @@
package org.apache.james.socket;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.james.util.watchdog.Watchdog;
import java.io.InputStream;
import java.io.OutputStream;
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/SchedulerWatchdogFactory.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/SchedulerWatchdogFactory.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/SchedulerWatchdogFactory.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java Wed Aug 19 10:43:28 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util.watchdog;
+package org.apache.james.socket;
import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
import org.apache.avalon.cornerstone.services.scheduler.Target;
@@ -77,7 +77,7 @@
}
/**
- * @see org.apache.james.util.watchdog.WatchdogFactory#getWatchdog(WatchdogTarget)
+ * @see org.apache.james.socket.WatchdogFactory#getWatchdog(WatchdogTarget)
*/
public Watchdog getWatchdog(WatchdogTarget theTarget) {
return new SchedulerWatchdog(theTarget);
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ServerConnection.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ServerConnection.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ServerConnection.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ServerConnection.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ServerConnection.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/ServerConnection.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ServerConnection.java Wed Aug 19 10:43:28 2009
@@ -19,7 +19,7 @@
-package org.apache.james.util.connection;
+package org.apache.james.socket;
import java.io.IOException;
import java.io.InterruptedIOException;
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java (from r805711, 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/socket/SimpleConnectionManager.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/SimpleConnectionManager.java&r1=805711&r2=805741&rev=805741&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/socket/SimpleConnectionManager.java Wed Aug 19 10:43:28 2009
@@ -19,12 +19,11 @@
-package org.apache.james.util.connection;
+package org.apache.james.socket;
import java.net.ServerSocket;
import java.util.HashMap;
import org.apache.excalibur.thread.ThreadPool;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
-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;
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java Wed Aug 19 10:43:28 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util.watchdog;
+package org.apache.james.socket;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
@@ -56,7 +56,7 @@
}
/**
- * @see org.apache.james.util.watchdog.WatchdogFactory#getWatchdog(WatchdogTarget)
+ * @see org.apache.james.socket.WatchdogFactory#getWatchdog(WatchdogTarget)
*/
public Watchdog getWatchdog(WatchdogTarget theTarget)
throws Exception {
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/Watchdog.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/Watchdog.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/Watchdog.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java Wed Aug 19 10:43:28 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util.watchdog;
+package org.apache.james.socket;
/**
* This interface represents an abstract watchdog process that serves to
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogFactory.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogFactory.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogFactory.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java Wed Aug 19 10:43:28 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util.watchdog;
+package org.apache.james.socket;
/**
* This interface represents a factory for producing Watchdogs.
Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogTarget.java (from r805711, james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogTarget.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogTarget.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogTarget.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogTarget.java&r1=805711&r2=805741&rev=805741&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/WatchdogTarget.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogTarget.java Wed Aug 19 10:43:28 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util.watchdog;
+package org.apache.james.socket;
/**
* This interface represents an action to be triggered by a watchdog process.
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=805741&r1=805740&r2=805741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Wed Aug 19 10:43:28 2009
@@ -330,7 +330,7 @@
<!-- The Connection Manager block -->
<block name="connections"
- class="org.apache.james.util.connection.SimpleConnectionManager" >
+ class="org.apache.james.socket.SimpleConnectionManager" >
<provide name="thread-manager"
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
<proxy disable='true'/>
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=805741&r1=805740&r2=805741&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 Wed Aug 19 10:43:28 2009
@@ -29,6 +29,7 @@
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailServer;
import org.apache.james.socket.JamesConnectionManager;
+import org.apache.james.socket.SimpleConnectionManager;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.avalon.MockSocketManager;
@@ -41,7 +42,6 @@
import org.apache.james.test.util.Util;
import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.userrepository.MockUsersRepository;
-import org.apache.james.util.connection.SimpleConnectionManager;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
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=805741&r1=805740&r2=805741&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 Wed Aug 19 10:43:28 2009
@@ -28,7 +28,7 @@
import org.apache.james.socket.CRLFTerminatedReader;
import org.apache.james.socket.ProtocolHandler;
import org.apache.james.socket.ProtocolHandlerHelper;
-import org.apache.james.util.watchdog.Watchdog;
+import org.apache.james.socket.Watchdog;
import org.apache.mailet.Mail;
import java.io.IOException;
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java?rev=805741&r1=805740&r2=805741&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java Wed Aug 19 10:43:28 2009
@@ -23,7 +23,7 @@
import org.apache.james.services.MailRepository;
-import org.apache.james.util.watchdog.Watchdog;
+import org.apache.james.socket.Watchdog;
import java.io.IOException;
import java.io.OutputStream;
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java?rev=805741&r1=805740&r2=805741&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java Wed Aug 19 10:43:28 2009
@@ -21,8 +21,8 @@
package org.apache.james.pop3server;
+import org.apache.james.socket.BytesWrittenResetOutputStream;
import org.apache.james.util.stream.ExtraDotOutputStream;
-import org.apache.james.util.watchdog.BytesWrittenResetOutputStream;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java?rev=805741&r1=805740&r2=805741&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java Wed Aug 19 10:43:28 2009
@@ -21,8 +21,8 @@
package org.apache.james.pop3server;
+import org.apache.james.socket.BytesWrittenResetOutputStream;
import org.apache.james.util.stream.ExtraDotOutputStream;
-import org.apache.james.util.watchdog.BytesWrittenResetOutputStream;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
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=805741&r1=805740&r2=805741&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 Wed Aug 19 10:43:28 2009
@@ -41,7 +41,7 @@
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.POP3BeforeSMTPHelper;
-import org.apache.james.util.connection.SimpleConnectionManager;
+import org.apache.james.socket.SimpleConnectionManager;
import org.apache.mailet.MailAddress;
import javax.mail.MessagingException;
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=805741&r1=805740&r2=805741&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 Wed Aug 19 10:43:28 2009
@@ -38,6 +38,7 @@
import org.apache.james.management.DomainListManagementService;
import org.apache.james.services.MailServer;
import org.apache.james.socket.JamesConnectionManager;
+import org.apache.james.socket.SimpleConnectionManager;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.avalon.MockSocketManager;
@@ -49,7 +50,6 @@
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.InternetPrintWriter;
-import org.apache.james.util.connection.SimpleConnectionManager;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
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=805741&r1=805740&r2=805741&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 Wed Aug 19 10:43:28 2009
@@ -30,7 +30,7 @@
import org.apache.james.socket.ProtocolHandler;
import org.apache.james.socket.ProtocolHandlerHelper;
-import org.apache.james.util.CRLFDelimitedByteBuffer;
+import org.apache.james.socket.CRLFDelimitedByteBuffer;
import org.apache.mailet.base.RFC822DateFormat;
/**
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=805741&r1=805740&r2=805741&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 Wed Aug 19 10:43:28 2009
@@ -39,7 +39,7 @@
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.codec.Base64;
-import org.apache.james.util.connection.SimpleConnectionManager;
+import org.apache.james.socket.SimpleConnectionManager;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
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=805741&r1=805740&r2=805741&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 Wed Aug 19 10:43:28 2009
@@ -304,7 +304,7 @@
<!-- The Connection Manager block -->
<block name="connections"
- class="org.apache.james.util.connection.SimpleConnectionManager" >
+ class="org.apache.james.socket.SimpleConnectionManager" >
<provide name="thread-manager"
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
</block>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org