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 no...@apache.org on 2010/01/27 19:51:25 UTC
svn commit: r903782 - in /james/server/trunk: ./ imapserver-function/
mina-socket-library/src/main/java/org/apache/james/socket/
pop3server-function/
pop3server-function/src/main/java/org/apache/james/pop3server/mina/
remotemanager-function/ remotemana...
Author: norman
Date: Wed Jan 27 18:51:24 2010
New Revision: 903782
URL: http://svn.apache.org/viewvc?rev=903782&view=rev
Log:
Remove code which is not needed anymore after removing cornerstone
Added:
james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java
- copied, changed from r903700, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java
Removed:
james/server/trunk/socket-api/src/main/java/org/apache/james/socket/api/
james/server/trunk/socket-shared-library/
Modified:
james/server/trunk/imapserver-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/mina/AsyncPOP3Server.java
james/server/trunk/remotemanager-function/pom.xml
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java
james/server/trunk/smtpserver-function/pom.xml
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
james/server/trunk/spring-deployment/pom.xml
Modified: james/server/trunk/imapserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Wed Jan 27 18:51:24 2010
@@ -74,11 +74,6 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-mina-socket-library</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-socket-shared-library</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-api</artifactId>
Copied: james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java (from r903700, james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java?p2=james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java&r1=903700&r2=903782&rev=903782&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChainImpl.java (original)
+++ james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java Wed Jan 27 18:51:24 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.socket.shared;
+package org.apache.james.socket;
import java.util.Iterator;
import java.util.LinkedList;
@@ -63,7 +63,7 @@
}
/**
- * @see org.apache.james.socket.shared.ProtocolHandlerChainImpl#getLog()
+ * @see org.apache.james.socket.ProtocolHandlerChainImpl#getLog()
*/
protected Log getLog() {
return log;
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Jan 27 18:51:24 2010
@@ -56,7 +56,6 @@
<module>experimental-activemq-function</module>
<module>jcr-store</module>
<module>spring-deployment</module>
- <module>socket-shared-library</module>
<module>mina-socket-library</module>
</modules>
<ciManagement>
@@ -228,11 +227,6 @@
<artifactId>james-server-mina-socket-library</artifactId>
<version>3.0-M1</version>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-socket-shared-library</artifactId>
- <version>3.0-M1</version>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/pop3server-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/pom.xml?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/pom.xml (original)
+++ james/server/trunk/pop3server-function/pom.xml Wed Jan 27 18:51:24 2010
@@ -77,11 +77,6 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-socket-shared-library</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mina-socket-library</artifactId>
</dependency>
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/mina/AsyncPOP3Server.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/mina/AsyncPOP3Server.java?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/mina/AsyncPOP3Server.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/mina/AsyncPOP3Server.java Wed Jan 27 18:51:24 2010
@@ -30,9 +30,9 @@
import org.apache.james.pop3server.POP3ServerMBean;
import org.apache.james.pop3server.core.CoreCmdHandlerLoader;
import org.apache.james.pop3server.mina.filter.POP3ResponseFilter;
+import org.apache.james.socket.ProtocolHandlerChainImpl;
import org.apache.james.socket.mina.AbstractAsyncServer;
import org.apache.james.socket.mina.filter.ResponseValidationFilter;
-import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.service.IoHandler;
Modified: james/server/trunk/remotemanager-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/pom.xml?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/pom.xml (original)
+++ james/server/trunk/remotemanager-function/pom.xml Wed Jan 27 18:51:24 2010
@@ -57,12 +57,6 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-socket-shared-library</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/mina/AsyncRemoteManager.java Wed Jan 27 18:51:24 2010
@@ -30,9 +30,9 @@
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.core.CoreCmdHandlerLoader;
import org.apache.james.remotemanager.mina.filter.RemoteManagerResponseFilter;
+import org.apache.james.socket.ProtocolHandlerChainImpl;
import org.apache.james.socket.mina.AbstractAsyncServer;
import org.apache.james.socket.mina.filter.ResponseValidationFilter;
-import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.service.IoHandler;
Modified: james/server/trunk/smtpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Wed Jan 27 18:51:24 2010
@@ -76,10 +76,6 @@
<artifactId>james-server-mina-socket-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-socket-shared-library</artifactId>
- </dependency>
- <dependency>
<groupId>${javax.activation.groupId}</groupId>
<artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java Wed Jan 27 18:51:24 2010
@@ -32,9 +32,9 @@
import org.apache.james.smtpserver.protocol.SMTPConfiguration;
import org.apache.james.smtpserver.protocol.SMTPResponse;
import org.apache.james.smtpserver.protocol.SMTPServerMBean;
+import org.apache.james.socket.ProtocolHandlerChainImpl;
import org.apache.james.socket.mina.AbstractAsyncServer;
import org.apache.james.socket.mina.filter.ResponseValidationFilter;
-import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.service.IoHandler;
Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=903782&r1=903781&r2=903782&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Wed Jan 27 18:51:24 2010
@@ -230,12 +230,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-socket-shared-library</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-javamail-util</artifactId>
<scope>runtime</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org