Author: norman
Date: Mon Jan 10 18:30:47 2011
New Revision: 1057303
URL: http://svn.apache.org/viewvc?rev=1057303&view=rev
Log:
adjust packages for to match protocols-library. See JAMES-1181
Added:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/
- copied from r1057300,
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/
- copied from r1057300,
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java
- copied, changed from r1057295,
james/server/trunk/protocols-library/src/test/java/org/apache/james/server/PortUtil.java
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/
- copied from r1057295,
james/server/trunk/protocols-library/src/test/java/org/apache/james/server/mock/
Removed:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/jmx/
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/library/netty/
james/server/trunk/protocols-library/src/test/java/org/apache/james/server/PortUtil.java
james/server/trunk/protocols-library/src/test/java/org/apache/james/server/mock/
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/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/CommandHandlerStatsMBean.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/HandlerStatsMBean.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ServerMBean.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.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
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.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=1057303&r1=1057302&r2=1057303&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:30:47 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.protocols.library.netty.AbstractConfigurableAsyncServer;
+import org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imapserver.netty;
-import org.apache.james.protocols.library.jmx.ServerMBean;
+import org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -25,7 +25,7 @@ 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.lib.netty.AbstractConfigurableAsyncServer;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.smtpserver.netty.SMTPChannelUpstreamHandler;
import org.apache.james.smtpserver.netty.SMTPResponseEncoder;
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=1057303&r1=1057302&r2=1057303&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:30:47 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.protocols.library.jmx.AbstractCommandHandlerResultJMXMonitor;
-import org.apache.james.protocols.library.jmx.AbstractCommandHandlerStats;
+import
org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor;
+import org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -19,7 +19,7 @@
package org.apache.james.pop3server.jmx;
import org.apache.james.pop3server.POP3Session;
-import
org.apache.james.protocols.library.jmx.AbstractConnectHandlerResultJMXMonitor;
+import
org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -19,7 +19,7 @@
package org.apache.james.pop3server.jmx;
import org.apache.james.pop3server.POP3Session;
-import
org.apache.james.protocols.library.jmx.AbstractLineHandlerResultJMXMonitor;
+import org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -26,7 +26,7 @@ import javax.management.MalformedObjectN
import javax.management.NotCompliantMBeanException;
import org.apache.james.pop3server.POP3Response;
-import org.apache.james.protocols.library.jmx.AbstractCommandHandlerStats;
+import org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.pop3server.jmx;
-import org.apache.james.protocols.library.jmx.CommandHandlerStatsMBean;
+import org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 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.protocols.library.netty.AbstractConfigurableAsyncServer;
+import org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.pop3server.netty;
-import org.apache.james.protocols.library.jmx.ServerMBean;
+import org.apache.james.protocols.lib.jmx.ServerMBean;
public interface POP3ServerMBean extends ServerMBean{
Modified:
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1057303&r1=1057302&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Mon Jan 10 18:30:47 2011
@@ -49,9 +49,9 @@ import org.apache.james.mailbox.inmemory
import org.apache.james.mailbox.inmemory.mail.InMemoryCachingUidProvider;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.pop3server.netty.POP3Server;
-import org.apache.james.server.PortUtil;
-import org.apache.james.server.mock.MockJSR250Loader;
-import org.apache.james.server.mock.MockProtocolHandlerChain;
+import org.apache.james.protocols.lib.PortUtil;
+import org.apache.james.protocols.lib.mock.MockJSR250Loader;
+import org.apache.james.protocols.lib.mock.MockProtocolHandlerChain;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.mock.MockUsersRepository;
import org.apache.james.util.POP3BeforeSMTPHelper;
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.jmx;
import java.util.ArrayList;
import java.util.HashMap;
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.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/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.jmx;
import java.util.ArrayList;
import java.util.HashMap;
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.jmx;
import java.util.ArrayList;
import java.util.HashMap;
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/CommandHandlerStatsMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/CommandHandlerStatsMBean.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/CommandHandlerStatsMBean.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/CommandHandlerStatsMBean.java
Mon Jan 10 18:30:47 2011
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.jmx;
-import org.apache.james.protocols.library.jmx.HandlerStatsMBean;
+import org.apache.james.protocols.lib.jmx.HandlerStatsMBean;
/**
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.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/lib/jmx/HandlerStatsMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/HandlerStatsMBean.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/HandlerStatsMBean.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/HandlerStatsMBean.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.jmx;
/**
* JMX MBean for Handler statistics
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.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/lib/jmx/ServerMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ServerMBean.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ServerMBean.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ServerMBean.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.jmx;
+package org.apache.james.protocols.lib.jmx;
/**
* JMX MBean interface for servers
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.netty;
+package org.apache.james.protocols.lib.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.protocols.library.jmx.ServerMBean;
+import org.apache.james.protocols.lib.jmx.ServerMBean;
import org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutor;
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java?rev=1057303&r1=1057300&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.library.netty;
+package org.apache.james.protocols.lib.netty;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
Copied:
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java
(from r1057295,
james/server/trunk/protocols-library/src/test/java/org/apache/james/server/PortUtil.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java?p2=james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java&p1=james/server/trunk/protocols-library/src/test/java/org/apache/james/server/PortUtil.java&r1=1057295&r2=1057303&rev=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/test/java/org/apache/james/server/PortUtil.java
(original)
+++
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java
Mon Jan 10 18:30:47 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.server;
+package org.apache.james.protocols.lib;
Modified:
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java?rev=1057303&r1=1057295&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java
(original)
+++
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java
Mon Jan 10 18:30:47 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.server.mock;
+package org.apache.james.protocols.lib.mock;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified:
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java?rev=1057303&r1=1057295&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java
(original)
+++
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java
Mon Jan 10 18:30:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.server.mock;
+package org.apache.james.protocols.lib.mock;
import java.util.Iterator;
import java.util.LinkedList;
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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -24,8 +24,8 @@ 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.lib.jmx.AbstractCommandHandlerResultJMXMonitor;
+import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPSession;
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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.smtpserver.jmx;
-import
org.apache.james.protocols.library.jmx.AbstractConnectHandlerResultJMXMonitor;
+import
org.apache.james.protocols.lib.jmx.AbstractConnectHandlerResultJMXMonitor;
import org.apache.james.protocols.smtp.SMTPSession;
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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.smtpserver.jmx;
-import
org.apache.james.protocols.library.jmx.AbstractLineHandlerResultJMXMonitor;
+import org.apache.james.protocols.lib.jmx.AbstractLineHandlerResultJMXMonitor;
import org.apache.james.protocols.smtp.SMTPSession;
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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -27,7 +27,7 @@ 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.lib.jmx.AbstractCommandHandlerStats;
import org.apache.james.protocols.smtp.SMTPResponse;
/**
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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.smtpserver.jmx;
-import org.apache.james.protocols.library.jmx.CommandHandlerStatsMBean;
+import org.apache.james.protocols.lib.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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -27,7 +27,7 @@ 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.lib.netty.AbstractConfigurableAsyncServer;
import org.apache.james.protocols.smtp.SMTPConfiguration;
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=1057303&r1=1057302&r2=1057303&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:30:47 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.smtpserver.netty;
-import org.apache.james.protocols.library.jmx.ServerMBean;
+import org.apache.james.protocols.lib.jmx.ServerMBean;
/**
* JMX MBean interface for the SMTPServer
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=1057303&r1=1057302&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Mon Jan 10 18:30:47 2011
@@ -43,11 +43,11 @@ import org.apache.commons.logging.impl.S
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.james.protocols.impl.AbstractChannelPipelineFactory;
+import org.apache.james.protocols.lib.PortUtil;
+import org.apache.james.protocols.lib.mock.MockJSR250Loader;
+import org.apache.james.protocols.lib.mock.MockProtocolHandlerChain;
import org.apache.james.queue.api.mock.MockMailQueue;
import org.apache.james.queue.api.mock.MockMailQueueFactory;
-import org.apache.james.server.PortUtil;
-import org.apache.james.server.mock.MockJSR250Loader;
-import org.apache.james.server.mock.MockProtocolHandlerChain;
import org.apache.james.smtpserver.netty.SMTPServer;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.mock.SimpleDomainList;
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=1057303&r1=1057302&r2=1057303&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
Mon Jan 10 18:30:47 2011
@@ -29,11 +29,11 @@ import javax.mail.internet.MimeMessage;
import junit.framework.TestCase;
+import org.apache.james.protocols.lib.PortUtil;
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.server.PortUtil;
import org.apache.james.smtpserver.fastfail.SpamAssassinHandler;
import org.apache.james.smtpserver.mock.MockMimeMessage;
import org.apache.james.smtpserver.mock.mailet.MockMail;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
