Author: norman Date: Mon Jan 10 18:26:37 2011 New Revision: 1057299 URL: http://svn.apache.org/viewvc?rev=1057299&view=rev Log: adjust packages for to match protocols-library. See JAMES-1181
Added: james/server/trunk/nio-netty/ james/server/trunk/nio-netty/target/ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ - copied from r1057295, james/server/trunk/protocols-library/src/main/java/org/apache/james/server/jmx/ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/ - copied from r1057295, james/server/trunk/protocols-library/src/main/java/org/apache/james/server/netty/ Removed: james/server/trunk/protocols-library/src/main/java/org/apache/james/server/jmx/ james/server/trunk/protocols-library/src/main/java/org/apache/james/server/netty/ Modified: 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/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java 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/POP3Server.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerResultJMXMonitor.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerStats.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractConnectHandlerResultJMXMonitor.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractLineHandlerResultJMXMonitor.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/CommandHandlerStatsMBean.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ConnectHandlerStats.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/HandlerStatsMBean.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/LineHandlerStats.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ServerMBean.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/AbstractConfigurableAsyncServer.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/ConnectionCountHandler.java 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 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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -32,7 +32,7 @@ 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.server.netty.AbstractConfigurableAsyncServer; +import org.apache.james.protocols.library.netty.AbstractConfigurableAsyncServer; 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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.imapserver.netty; -import org.apache.james.server.jmx.ServerMBean; +import org.apache.james.protocols.library.jmx.ServerMBean; public interface IMAPServerMBean extends ServerMBean{ 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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -25,10 +25,10 @@ import org.apache.commons.configuration. import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory; +import org.apache.james.protocols.library.netty.AbstractConfigurableAsyncServer; 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.server.netty.AbstractConfigurableAsyncServer; 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/jmx/CommandHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -26,8 +26,8 @@ import org.apache.james.lifecycle.api.Co import org.apache.james.pop3server.POP3Response; import org.apache.james.pop3server.POP3Session; import org.apache.james.protocols.api.CommandHandler; -import org.apache.james.server.jmx.AbstractCommandHandlerResultJMXMonitor; -import org.apache.james.server.jmx.AbstractCommandHandlerStats; +import org.apache.james.protocols.library.jmx.AbstractCommandHandlerResultJMXMonitor; +import org.apache.james.protocols.library.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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -19,7 +19,7 @@ package org.apache.james.pop3server.jmx; import org.apache.james.pop3server.POP3Session; -import org.apache.james.server.jmx.AbstractConnectHandlerResultJMXMonitor; +import org.apache.james.protocols.library.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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -19,7 +19,7 @@ package org.apache.james.pop3server.jmx; import org.apache.james.pop3server.POP3Session; -import org.apache.james.server.jmx.AbstractLineHandlerResultJMXMonitor; +import org.apache.james.protocols.library.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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -26,7 +26,7 @@ import javax.management.MalformedObjectN import javax.management.NotCompliantMBeanException; import org.apache.james.pop3server.POP3Response; -import org.apache.james.server.jmx.AbstractCommandHandlerStats; +import org.apache.james.protocols.library.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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.pop3server.jmx; -import org.apache.james.server.jmx.CommandHandlerStatsMBean; +import org.apache.james.protocols.library.jmx.CommandHandlerStatsMBean; public interface POP3CommandHandlerStatsMBean extends CommandHandlerStatsMBean{ 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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -24,7 +24,7 @@ import javax.net.ssl.SSLContext; import org.apache.james.pop3server.POP3HandlerConfigurationData; import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory; -import org.apache.james.server.netty.AbstractConfigurableAsyncServer; +import org.apache.james.protocols.library.netty.AbstractConfigurableAsyncServer; 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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.pop3server.netty; -import org.apache.james.server.jmx.ServerMBean; +import org.apache.james.protocols.library.jmx.ServerMBean; public interface POP3ServerMBean extends ServerMBean{ Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerResultJMXMonitor.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerResultJMXMonitor.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerResultJMXMonitor.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; import java.util.ArrayList; import java.util.HashMap; Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerStats.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerStats.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractCommandHandlerStats.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; import java.lang.management.ManagementFactory; import java.util.concurrent.atomic.AtomicLong; Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractConnectHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractConnectHandlerResultJMXMonitor.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractConnectHandlerResultJMXMonitor.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractConnectHandlerResultJMXMonitor.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; import java.util.ArrayList; import java.util.HashMap; Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractLineHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractLineHandlerResultJMXMonitor.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractLineHandlerResultJMXMonitor.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/AbstractLineHandlerResultJMXMonitor.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; import java.util.ArrayList; import java.util.HashMap; Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/CommandHandlerStatsMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/CommandHandlerStatsMBean.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/CommandHandlerStatsMBean.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/CommandHandlerStatsMBean.java Mon Jan 10 18:26:37 2011 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; -import org.apache.james.server.jmx.HandlerStatsMBean; +import org.apache.james.protocols.library.jmx.HandlerStatsMBean; /** Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ConnectHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ConnectHandlerStats.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ConnectHandlerStats.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ConnectHandlerStats.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; import java.lang.management.ManagementFactory; import java.util.concurrent.atomic.AtomicLong; Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/HandlerStatsMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/HandlerStatsMBean.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/HandlerStatsMBean.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/HandlerStatsMBean.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; /** * JMX MBean for Handler statistics Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/LineHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/LineHandlerStats.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/LineHandlerStats.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/LineHandlerStats.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; import java.lang.management.ManagementFactory; import java.util.concurrent.atomic.AtomicLong; Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ServerMBean.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ServerMBean.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ServerMBean.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/ServerMBean.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.jmx; +package org.apache.james.protocols.library.jmx; /** * JMX MBean interface for servers Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/AbstractConfigurableAsyncServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/AbstractConfigurableAsyncServer.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/AbstractConfigurableAsyncServer.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/AbstractConfigurableAsyncServer.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.netty; +package org.apache.james.protocols.library.netty; import java.io.FileInputStream; import java.net.InetAddress; @@ -39,7 +39,7 @@ import org.apache.james.filesystem.api.F import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.protocols.impl.AbstractAsyncServer; -import org.apache.james.server.jmx.ServerMBean; +import org.apache.james.protocols.library.jmx.ServerMBean; import org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutor; Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/ConnectionCountHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/ConnectionCountHandler.java?rev=1057299&r1=1057295&r2=1057299&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/ConnectionCountHandler.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/ConnectionCountHandler.java Mon Jan 10 18:26:37 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.server.netty; +package org.apache.james.protocols.library.netty; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; 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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -24,10 +24,10 @@ import org.apache.commons.configuration. import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.protocols.api.CommandHandler; +import org.apache.james.protocols.library.jmx.AbstractCommandHandlerResultJMXMonitor; +import org.apache.james.protocols.library.jmx.AbstractCommandHandlerStats; import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.protocols.smtp.SMTPSession; -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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.smtpserver.jmx; +import org.apache.james.protocols.library.jmx.AbstractConnectHandlerResultJMXMonitor; import org.apache.james.protocols.smtp.SMTPSession; -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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.smtpserver.jmx; +import org.apache.james.protocols.library.jmx.AbstractLineHandlerResultJMXMonitor; import org.apache.james.protocols.smtp.SMTPSession; -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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -27,8 +27,8 @@ import javax.management.NotCompliantMBea import org.apache.james.lifecycle.api.Disposable; import org.apache.james.protocols.api.CommandHandler; +import org.apache.james.protocols.library.jmx.AbstractCommandHandlerStats; import org.apache.james.protocols.smtp.SMTPResponse; -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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.smtpserver.jmx; -import org.apache.james.server.jmx.CommandHandlerStatsMBean; +import org.apache.james.protocols.library.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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -27,8 +27,8 @@ import org.apache.commons.configuration. import org.apache.james.dnsservice.library.netmatcher.NetMatcher; import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory; +import org.apache.james.protocols.library.netty.AbstractConfigurableAsyncServer; import org.apache.james.protocols.smtp.SMTPConfiguration; -import org.apache.james.server.netty.AbstractConfigurableAsyncServer; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelUpstreamHandler; 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=1057299&r1=1057298&r2=1057299&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 Mon Jan 10 18:26:37 2011 @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.smtpserver.netty; -import org.apache.james.server.jmx.ServerMBean; +import org.apache.james.protocols.library.jmx.ServerMBean; /** * JMX MBean interface for the SMTPServer --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org