Author: bago
Date: Tue Oct 13 01:06:29 2009
New Revision: 824558
URL: http://svn.apache.org/viewvc?rev=824558&view=rev
Log:
trying to add maven 2 dependencies to fix m2 build.
ant is broken because a library (avalon-socket-library) cannot depend on
another library (socket-shared-library). maybe we need a socket-api and then
the 2 libraries should not depend on each other.
Added:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
(contents, props changed)
- copied, changed from r824505,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/WiringException.java
- copied, changed from r824505,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WiringException.java
Removed:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WiringException.java
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java
james/server/trunk/nntpserver-function/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server-function/pom.xml
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/core/CapaCmdHandler.java
james/server/trunk/remotemanager-function/pom.xml
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java
james/server/trunk/smtpserver-function/pom.xml
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataLineMessageHookHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java
james/server/trunk/socket-shared-library/ (props changed)
james/server/trunk/socket-shared-library/pom.xml
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractCommandDispatcher.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ExtensibleHandler.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java
james/server/trunk/spring-deployment/pom.xml
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java
Tue Oct 13 01:06:29 2009
@@ -59,6 +59,7 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.FileSystem;
import org.apache.james.socket.shared.ProtocolHandler;
+import org.apache.james.socket.shared.Watchdog;
/**
* Server which creates connection handlers. All new James service must
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesReadResetInputStream.java
Tue Oct 13 01:06:29 2009
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.io.InputStream;
+import org.apache.james.socket.shared.Watchdog;
+
/**
* This will reset the Watchdog each time a certain amount of data has
* been transferred. This allows us to keep the timeout settings low, while
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/BytesWrittenResetOutputStream.java
Tue Oct 13 01:06:29 2009
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.james.socket.shared.Watchdog;
+
/**
* This will reset the Watchdog each time a certain amount of data has
* been transferred. This allows us to keep the timeout settings low, while
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/InaccurateTimeoutWatchdog.java
Tue Oct 13 01:06:29 2009
@@ -21,6 +21,7 @@
package org.apache.james.socket;
import org.apache.excalibur.thread.ThreadPool;
+import org.apache.james.socket.shared.Watchdog;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/JamesConnectionBridge.java
Tue Oct 13 01:06:29 2009
@@ -45,6 +45,7 @@
import org.apache.james.socket.shared.ProtocolHandler;
import org.apache.james.socket.shared.SwitchableInputStream;
import org.apache.james.socket.shared.SwitchableOutputStream;
+import org.apache.james.socket.shared.Watchdog;
import org.apache.james.util.InternetPrintWriter;
/**
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SchedulerWatchdogFactory.java
Tue Oct 13 01:06:29 2009
@@ -23,6 +23,7 @@
import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
import org.apache.avalon.cornerstone.services.scheduler.Target;
import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
+import org.apache.james.socket.shared.Watchdog;
/**
* This class is a factory to produce Watchdogs, each of which is associated
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/ThreadPerWatchdogFactory.java
Tue Oct 13 01:06:29 2009
@@ -23,6 +23,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.thread.ThreadPool;
+import org.apache.james.socket.shared.Watchdog;
/**
* This class is a factory to produce Watchdogs, each of which is associated
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java
(original)
+++
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WatchdogFactory.java
Tue Oct 13 01:06:29 2009
@@ -20,6 +20,8 @@
package org.apache.james.socket;
+import org.apache.james.socket.shared.Watchdog;
+
/**
* This interface represents a factory for producing Watchdogs.
*
Modified: james/server/trunk/nntpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/pom.xml?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/pom.xml (original)
+++ james/server/trunk/nntpserver-function/pom.xml Tue Oct 13 01:06:29 2009
@@ -79,6 +79,34 @@
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Oct 13 01:06:29 2009
@@ -343,6 +343,13 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>3.0-M1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
<version>3.0-M1</version>
</dependency>
@@ -635,6 +642,12 @@
<artifactId>commons-lang</artifactId>
<version>2.2</version>
</dependency>
+ <!-- used by spring deployment -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
<!-- used by torque -->
<dependency>
<groupId>commons-pool</groupId>
Modified: james/server/trunk/pop3server-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/pom.xml?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/pom.xml (original)
+++ james/server/trunk/pop3server-function/pom.xml Tue Oct 13 01:06:29 2009
@@ -50,6 +50,17 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
</dependency>
<dependency>
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=824558&r1=824557&r2=824558&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
Tue Oct 13 01:06:29 2009
@@ -32,10 +32,10 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.services.MailRepository;
-import org.apache.james.socket.Watchdog;
import org.apache.james.socket.shared.AbstractProtocolHandler;
import org.apache.james.socket.shared.CRLFTerminatedReader;
import org.apache.james.socket.shared.ProtocolContext;
+import org.apache.james.socket.shared.Watchdog;
import org.apache.mailet.Mail;
/**
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=824558&r1=824557&r2=824558&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
Tue Oct 13 01:06:29 2009
@@ -27,8 +27,8 @@
import java.util.Map;
import org.apache.james.services.MailRepository;
-import org.apache.james.socket.Watchdog;
import org.apache.james.socket.shared.TLSSupportedSession;
+import org.apache.james.socket.shared.Watchdog;
import org.apache.mailet.Mail;
/**
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
Tue Oct 13 01:06:29 2009
@@ -27,8 +27,8 @@
import org.apache.james.pop3server.CommandHandler;
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
-import org.apache.james.socket.WiringException;
import org.apache.james.socket.shared.ExtensibleHandler;
+import org.apache.james.socket.shared.WiringException;
/**
* This handler is used to handle CAPA commands
Modified: james/server/trunk/remotemanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/pom.xml?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/pom.xml (original)
+++ james/server/trunk/remotemanager-function/pom.xml Tue Oct 13 01:06:29 2009
@@ -93,6 +93,12 @@
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -113,5 +119,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
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=824558&r1=824557&r2=824558&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
Tue Oct 13 01:06:29 2009
@@ -29,10 +29,10 @@
import java.util.Map;
import org.apache.commons.logging.Log;
-import org.apache.james.socket.Watchdog;
import org.apache.james.socket.shared.CRLFTerminatedReader;
import org.apache.james.socket.shared.ProtocolContext;
import org.apache.james.socket.shared.ProtocolHandler;
+import org.apache.james.socket.shared.Watchdog;
/**
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
Tue Oct 13 01:06:29 2009
@@ -21,8 +21,8 @@
import java.util.Map;
-import org.apache.james.socket.Watchdog;
import org.apache.james.socket.shared.LogEnabledSession;
+import org.apache.james.socket.shared.Watchdog;
public interface RemoteManagerSession extends LogEnabledSession{
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java
Tue Oct 13 01:06:29 2009
@@ -27,8 +27,8 @@
import org.apache.james.remotemanager.CommandHelp;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
-import org.apache.james.socket.WiringException;
import org.apache.james.socket.shared.ExtensibleHandler;
+import org.apache.james.socket.shared.WiringException;
public class HelpCmdHandler implements CommandHandler, ExtensibleHandler{
Modified: james/server/trunk/smtpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Tue Oct 13 01:06:29 2009
@@ -62,6 +62,12 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
<dependency>
@@ -105,10 +111,10 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-jspf</artifactId>
</dependency>
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <scope>runtime</scope>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
Tue Oct 13 01:06:29 2009
@@ -40,8 +40,8 @@
import org.apache.james.smtpserver.SMTPResponse;
import org.apache.james.smtpserver.SMTPRetCode;
import org.apache.james.smtpserver.SMTPSession;
-import org.apache.james.socket.WiringException;
import org.apache.james.socket.shared.ExtensibleHandler;
+import org.apache.james.socket.shared.WiringException;
import org.apache.mailet.base.RFC2822Headers;
import org.apache.mailet.base.RFC822DateFormat;
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataLineMessageHookHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataLineMessageHookHandler.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataLineMessageHookHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataLineMessageHookHandler.java
Tue Oct 13 01:06:29 2009
@@ -44,9 +44,9 @@
import org.apache.james.smtpserver.hook.HookResult;
import org.apache.james.smtpserver.hook.HookResultHook;
import org.apache.james.smtpserver.hook.MessageHook;
-import org.apache.james.socket.WiringException;
import org.apache.james.socket.shared.ExtensibleHandler;
import org.apache.james.socket.shared.LogEnabled;
+import org.apache.james.socket.shared.WiringException;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java
Tue Oct 13 01:06:29 2009
@@ -40,8 +40,8 @@
import org.apache.james.smtpserver.hook.HookResultHook;
import org.apache.james.smtpserver.hook.HookReturnCode;
import org.apache.james.smtpserver.hook.MailParametersHook;
-import org.apache.james.socket.WiringException;
import org.apache.james.socket.shared.ExtensibleHandler;
+import org.apache.james.socket.shared.WiringException;
import org.apache.james.util.codec.Base64;
Propchange: james/server/trunk/socket-shared-library/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 13 01:06:29 2009
@@ -0,0 +1 @@
+target
Modified: james/server/trunk/socket-shared-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/pom.xml?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/pom.xml (original)
+++ james/server/trunk/socket-shared-library/pom.xml Tue Oct 13 01:06:29 2009
@@ -29,6 +29,18 @@
<name>Apache JAMES Server Shared Socket Library</name>
<dependencies>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractCommandDispatcher.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractCommandDispatcher.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractCommandDispatcher.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractCommandDispatcher.java
Tue Oct 13 01:06:29 2009
@@ -27,7 +27,6 @@
import java.util.Locale;
import org.apache.commons.logging.Log;
-import org.apache.james.socket.WiringException;
/**
* Abstract base class which CommandDispatcher implementations should extend
Modified:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
Tue Oct 13 01:06:29 2009
@@ -32,7 +32,6 @@
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.james.api.kernel.LoaderService;
-import org.apache.james.socket.WiringException;
/**
* Abstract class which HandlerChains should extend
Modified:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ExtensibleHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ExtensibleHandler.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ExtensibleHandler.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ExtensibleHandler.java
Tue Oct 13 01:06:29 2009
@@ -21,7 +21,6 @@
import java.util.List;
-import org.apache.james.socket.WiringException;
/**
Modified:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolContext.java
Tue Oct 13 01:06:29 2009
@@ -26,7 +26,6 @@
import java.io.PrintWriter;
import org.apache.commons.logging.Log;
-import org.apache.james.socket.Watchdog;
/**
* This is the helper interface provided to ProtocolHandlers to let them
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
(from r824505,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java&r1=824505&r2=824558&rev=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/Watchdog.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
Tue Oct 13 01:06:29 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.socket;
+package org.apache.james.socket.shared;
/**
* This interface represents an abstract watchdog process that serves to
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1.4.3
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/Watchdog.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/WiringException.java
(from r824505,
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WiringException.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/WiringException.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/WiringException.java&p1=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WiringException.java&r1=824505&r2=824558&rev=824558&view=diff
==============================================================================
---
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/WiringException.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/WiringException.java
Tue Oct 13 01:06:29 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.socket;
+package org.apache.james.socket.shared;
/**
* Indicates an issue prevent the successful wiring of the components
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=824558&r1=824557&r2=824558&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Tue Oct 13 01:06:29 2009
@@ -52,5 +52,9 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
