Author: norman Date: Wed Dec 15 14:26:02 2010 New Revision: 1049559 URL: http://svn.apache.org/viewvc?rev=1049559&view=rev Log: Rename netty-socket to nio-netty to be more inline with current naming
Added: james/server/trunk/nio-netty/ - copied from r1049463, james/server/trunk/netty-socket/ Removed: james/server/trunk/netty-socket/ Modified: james/server/trunk/container-spring/pom.xml james/server/trunk/imapserver/pom.xml james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServerMBean.java james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapStreamChannelUpstreamHandler.java james/server/trunk/lmtpserver/pom.xml james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java james/server/trunk/pom.xml james/server/trunk/pop3server/pom.xml james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NonWaitingChannelOutputStream.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java james/server/trunk/remotemanager/pom.xml james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerMBean.java james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java james/server/trunk/smtpserver/pom.xml james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStatsMBean.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Modified: james/server/trunk/container-spring/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/container-spring/pom.xml (original) +++ james/server/trunk/container-spring/pom.xml Wed Dec 15 14:26:02 2010 @@ -510,7 +510,7 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-netty-socket</artifactId> + <artifactId>james-server-nio-netty</artifactId> <scope>runtime</scope> </dependency> <dependency> Modified: james/server/trunk/imapserver/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/imapserver/pom.xml (original) +++ james/server/trunk/imapserver/pom.xml Wed Dec 15 14:26:02 2010 @@ -30,7 +30,7 @@ <dependencies> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-netty-socket</artifactId> + <artifactId>james-server-nio-netty</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> Modified: james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java (original) +++ james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java Wed Dec 15 14:26:02 2010 @@ -32,8 +32,8 @@ import org.apache.james.imap.encode.Imap import org.apache.james.imap.main.ImapRequestStreamHandler; import org.apache.james.protocols.impl.ChannelGroupHandler; import org.apache.james.protocols.impl.TimeoutHandler; -import org.apache.james.socket.netty.AbstractConfigurableAsyncServer; -import org.apache.james.socket.netty.ConnectionCountHandler; +import org.apache.james.server.netty.AbstractConfigurableAsyncServer; +import org.apache.james.server.netty.ConnectionCountHandler; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.group.ChannelGroup; Modified: james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServerMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServerMBean.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServerMBean.java (original) +++ james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServerMBean.java Wed Dec 15 14:26:02 2010 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.imapserver.netty; -import org.apache.james.socket.ServerMBean; +import org.apache.james.server.jmx.ServerMBean; public interface IMAPServerMBean extends ServerMBean{ Modified: james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapStreamChannelUpstreamHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapStreamChannelUpstreamHandler.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapStreamChannelUpstreamHandler.java (original) +++ james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapStreamChannelUpstreamHandler.java Wed Dec 15 14:26:02 2010 @@ -33,6 +33,7 @@ import org.apache.james.imap.api.process import org.apache.james.imap.main.ImapRequestStreamHandler; import org.apache.james.imap.main.ImapSessionImpl; import org.apache.james.protocols.impl.SessionLog; +import org.apache.james.server.netty.StreamHandler; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; @@ -40,7 +41,6 @@ import org.jboss.netty.channel.ChannelHa import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.handler.ssl.SslHandler; -import org.jboss.netty.handler.stream.StreamHandler; import org.jboss.netty.util.HashedWheelTimer; /** Modified: james/server/trunk/lmtpserver/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/lmtpserver/pom.xml (original) +++ james/server/trunk/lmtpserver/pom.xml Wed Dec 15 14:26:02 2010 @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-netty-socket</artifactId> + <artifactId>james-server-nio-netty</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java (original) +++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java Wed Dec 15 14:26:02 2010 @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.lmtpserver.netty; -import javax.annotation.Resource; import javax.net.ssl.SSLContext; import org.apache.commons.configuration.ConfigurationException; @@ -28,8 +27,8 @@ import org.apache.james.protocols.impl.A import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.smtpserver.netty.SMTPChannelUpstreamHandler; import org.apache.james.smtpserver.netty.SMTPResponseEncoder; -import org.apache.james.socket.netty.AbstractConfigurableAsyncServer; -import org.apache.james.socket.netty.ConnectionCountHandler; +import org.apache.james.server.netty.AbstractConfigurableAsyncServer; +import org.apache.james.server.netty.ConnectionCountHandler; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelUpstreamHandler; Modified: james/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pom.xml (original) +++ james/server/trunk/pom.xml Wed Dec 15 14:26:02 2010 @@ -56,7 +56,7 @@ <module>mail-jcr</module> <module>mail-jdbc</module> <module>mail-library</module> - <module>netty-socket</module> + <module>nio-netty</module> <module>osgi</module> <module>pop3server</module> <module>remotemanager</module> @@ -313,7 +313,7 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-netty-socket</artifactId> + <artifactId>james-server-nio-netty</artifactId> <version>${project.version}</version> </dependency> <dependency> Modified: james/server/trunk/pop3server/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/pom.xml (original) +++ james/server/trunk/pop3server/pom.xml Wed Dec 15 14:26:02 2010 @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-netty-socket</artifactId> + <artifactId>james-server-nio-netty</artifactId> </dependency> <dependency> <groupId>org.apache.james.protocols</groupId> Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java Wed Dec 15 14:26:02 2010 @@ -26,8 +26,8 @@ import org.apache.james.lifecycle.Config import org.apache.james.pop3server.POP3Response; import org.apache.james.pop3server.POP3Session; import org.apache.james.protocols.api.CommandHandler; -import org.apache.james.socket.AbstractCommandHandlerResultJMXMonitor; -import org.apache.james.socket.AbstractCommandHandlerStats; +import org.apache.james.server.jmx.AbstractCommandHandlerResultJMXMonitor; +import org.apache.james.server.jmx.AbstractCommandHandlerStats; /** * Gather JMX stats for {...@link CommandHandler} Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java Wed Dec 15 14:26:02 2010 @@ -19,7 +19,7 @@ package org.apache.james.pop3server.jmx; import org.apache.james.pop3server.POP3Session; -import org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor; +import org.apache.james.server.jmx.AbstractConnectHandlerResultJMXMonitor; public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<POP3Session>{ Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java Wed Dec 15 14:26:02 2010 @@ -19,7 +19,7 @@ package org.apache.james.pop3server.jmx; import org.apache.james.pop3server.POP3Session; -import org.apache.james.socket.AbstractLineHandlerResultJMXMonitor; +import org.apache.james.server.jmx.AbstractLineHandlerResultJMXMonitor; public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<POP3Session>{ Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java Wed Dec 15 14:26:02 2010 @@ -26,7 +26,7 @@ import javax.management.MalformedObjectN import javax.management.NotCompliantMBeanException; import org.apache.james.pop3server.POP3Response; -import org.apache.james.socket.AbstractCommandHandlerStats; +import org.apache.james.server.jmx.AbstractCommandHandlerStats; public class POP3CommandHandlerStats extends AbstractCommandHandlerStats<POP3Response> implements POP3CommandHandlerStatsMBean{ Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java Wed Dec 15 14:26:02 2010 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.pop3server.jmx; -import org.apache.james.socket.CommandHandlerStatsMBean; +import org.apache.james.server.jmx.CommandHandlerStatsMBean; public interface POP3CommandHandlerStatsMBean extends CommandHandlerStatsMBean{ Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NonWaitingChannelOutputStream.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NonWaitingChannelOutputStream.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NonWaitingChannelOutputStream.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NonWaitingChannelOutputStream.java Wed Dec 15 14:26:02 2010 @@ -21,8 +21,8 @@ package org.apache.james.pop3server.nett import java.io.IOException; import java.io.OutputStream; +import org.apache.james.server.netty.ChannelOutputStream; import org.jboss.netty.channel.Channel; -import org.jboss.netty.handler.stream.ChannelOutputStream; /** * Allow to write via an {...@link OutputStream} to the underlying {...@link Channel}. All writes are just passed to the {...@link Channel} without waiting for Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java Wed Dec 15 14:26:02 2010 @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.pop3server.netty; -import javax.annotation.Resource; import javax.net.ssl.SSLContext; import org.apache.commons.configuration.ConfigurationException; @@ -26,8 +25,8 @@ import org.apache.commons.configuration. import org.apache.james.pop3server.POP3HandlerConfigurationData; import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory; -import org.apache.james.socket.netty.AbstractConfigurableAsyncServer; -import org.apache.james.socket.netty.ConnectionCountHandler; +import org.apache.james.server.netty.AbstractConfigurableAsyncServer; +import org.apache.james.server.netty.ConnectionCountHandler; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelUpstreamHandler; Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java Wed Dec 15 14:26:02 2010 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.pop3server.netty; -import org.apache.james.socket.ServerMBean; +import org.apache.james.server.jmx.ServerMBean; public interface POP3ServerMBean extends ServerMBean{ Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java (original) +++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java Wed Dec 15 14:26:02 2010 @@ -37,6 +37,7 @@ import org.apache.commons.logging.impl.S import org.apache.commons.net.pop3.POP3Client; import org.apache.commons.net.pop3.POP3MessageInfo; import org.apache.commons.net.pop3.POP3Reply; +import org.apache.james.server.JamesProtocolHandlerChain; import org.apache.james.services.MockJSR250Loader; import org.apache.james.services.MockFileSystem; import org.apache.james.dnsservice.api.DNSService; @@ -49,7 +50,6 @@ import org.apache.james.mailbox.MessageM import org.apache.james.mailbox.MailboxConstants; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.store.Authenticator; -import org.apache.james.socket.JamesProtocolHandlerChain; import org.apache.james.user.lib.MockUsersRepository; import org.apache.james.util.POP3BeforeSMTPHelper; import org.apache.james.util.TestUtil; Modified: james/server/trunk/remotemanager/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/remotemanager/pom.xml (original) +++ james/server/trunk/remotemanager/pom.xml Wed Dec 15 14:26:02 2010 @@ -30,7 +30,7 @@ <dependencies> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-netty-socket</artifactId> + <artifactId>james-server-nio-netty</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java (original) +++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java Wed Dec 15 14:26:02 2010 @@ -23,15 +23,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.impl.AbstractChannelPipelineFactory; import org.apache.james.remotemanager.RemoteManagerHandlerConfigurationData; -import org.apache.james.socket.netty.AbstractConfigurableAsyncServer; -import org.apache.james.socket.netty.ConnectionCountHandler; +import org.apache.james.server.netty.AbstractConfigurableAsyncServer; +import org.apache.james.server.netty.ConnectionCountHandler; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelUpstreamHandler; Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerMBean.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerMBean.java (original) +++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerMBean.java Wed Dec 15 14:26:02 2010 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.remotemanager.netty; -import org.apache.james.socket.ServerMBean; +import org.apache.james.server.jmx.ServerMBean; public interface RemoteManagerMBean extends ServerMBean{ Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original) +++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Wed Dec 15 14:26:02 2010 @@ -36,6 +36,7 @@ import junit.framework.TestCase; import org.apache.commons.logging.impl.SimpleLog; import org.apache.commons.net.telnet.TelnetClient; +import org.apache.james.server.JamesProtocolHandlerChain; import org.apache.james.services.MockJSR250Loader; import org.apache.james.services.MockFileSystem; import org.apache.james.dnsservice.api.DNSService; @@ -44,7 +45,6 @@ import org.apache.james.domainlist.api.D import org.apache.james.domainlist.api.SimpleDomainList; import org.apache.james.lifecycle.LifecycleUtil; import org.apache.james.mailstore.MockMailStore; -import org.apache.james.socket.JamesProtocolHandlerChain; import org.apache.james.user.lib.MockUsersRepository; import org.apache.james.user.lib.MockUsersStore; import org.apache.james.util.InternetPrintWriter; Modified: james/server/trunk/smtpserver/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/pom.xml (original) +++ james/server/trunk/smtpserver/pom.xml Wed Dec 15 14:26:02 2010 @@ -58,7 +58,7 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-netty-socket</artifactId> + <artifactId>james-server-nio-netty</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java Wed Dec 15 14:26:02 2010 @@ -26,8 +26,8 @@ import org.apache.james.lifecycle.Config import org.apache.james.protocols.api.CommandHandler; import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.protocols.smtp.SMTPSession; -import org.apache.james.socket.AbstractCommandHandlerResultJMXMonitor; -import org.apache.james.socket.AbstractCommandHandlerStats; +import org.apache.james.server.jmx.AbstractCommandHandlerResultJMXMonitor; +import org.apache.james.server.jmx.AbstractCommandHandlerStats; /** * Expose JMX statistics for {...@link CommandHandler} Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java Wed Dec 15 14:26:02 2010 @@ -19,7 +19,7 @@ package org.apache.james.smtpserver.jmx; import org.apache.james.protocols.smtp.SMTPSession; -import org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor; +import org.apache.james.server.jmx.AbstractConnectHandlerResultJMXMonitor; public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<SMTPSession>{ Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java Wed Dec 15 14:26:02 2010 @@ -19,7 +19,7 @@ package org.apache.james.smtpserver.jmx; import org.apache.james.protocols.smtp.SMTPSession; -import org.apache.james.socket.AbstractLineHandlerResultJMXMonitor; +import org.apache.james.server.jmx.AbstractLineHandlerResultJMXMonitor; public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<SMTPSession>{ Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java Wed Dec 15 14:26:02 2010 @@ -28,7 +28,7 @@ import javax.management.NotCompliantMBea import org.apache.james.lifecycle.Disposable; import org.apache.james.protocols.api.CommandHandler; import org.apache.james.protocols.smtp.SMTPResponse; -import org.apache.james.socket.AbstractCommandHandlerStats; +import org.apache.james.server.jmx.AbstractCommandHandlerStats; /** * Expose statistics for {...@link CommandHandler} via JMX Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStatsMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStatsMBean.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStatsMBean.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStatsMBean.java Wed Dec 15 14:26:02 2010 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.smtpserver.jmx; -import org.apache.james.socket.CommandHandlerStatsMBean; +import org.apache.james.server.jmx.CommandHandlerStatsMBean; /** Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java Wed Dec 15 14:26:02 2010 @@ -19,7 +19,6 @@ package org.apache.james.smtpserver.netty; -import javax.annotation.Resource; import javax.net.ssl.SSLContext; import org.apache.commons.configuration.ConfigurationException; @@ -27,8 +26,8 @@ import org.apache.commons.configuration. import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory; import org.apache.james.protocols.smtp.SMTPConfiguration; -import org.apache.james.socket.netty.AbstractConfigurableAsyncServer; -import org.apache.james.socket.netty.ConnectionCountHandler; +import org.apache.james.server.netty.AbstractConfigurableAsyncServer; +import org.apache.james.server.netty.ConnectionCountHandler; import org.apache.james.util.netmatcher.NetMatcher; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java Wed Dec 15 14:26:02 2010 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.smtpserver.netty; -import org.apache.james.socket.ServerMBean; +import org.apache.james.server.jmx.ServerMBean; /** * JMX MBean interface for the SMTPServer Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=1049559&r1=1049558&r2=1049559&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original) +++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Wed Dec 15 14:26:02 2010 @@ -44,13 +44,13 @@ import org.apache.commons.net.smtp.SMTPC import org.apache.commons.net.smtp.SMTPReply; import org.apache.james.queue.api.MockMailQueue; import org.apache.james.queue.api.MockMailQueueFactory; +import org.apache.james.server.JamesProtocolHandlerChain; import org.apache.james.services.MockJSR250Loader; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.SimpleDomainList; import org.apache.james.lifecycle.LifecycleUtil; import org.apache.james.mailstore.MockMailStore; import org.apache.james.services.MockFileSystem; -import org.apache.james.socket.JamesProtocolHandlerChain; import org.apache.james.user.lib.MockUsersRepository; import org.apache.james.util.TestUtil; import org.apache.james.util.codec.Base64; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org