You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/10/25 08:02:28 UTC
svn commit: r1026948 - in /james/server/trunk:
container-spring/src/main/config/james/
fetchmail/src/main/java/org/apache/james/fetchmail/
imapserver/src/main/java/org/apache/james/imapserver/netty/
lmtpserver/src/main/java/org/apache/james/lmtpserver/...
Author: norman
Date: Mon Oct 25 06:02:27 2010
New Revision: 1026948
URL: http://svn.apache.org/viewvc?rev=1026948&view=rev
Log:
Make sure MBeans and the implementations are conform to spec (JAMES-1057)
Added:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
- copied, changed from r1026947, james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.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
- copied, changed from r1026947, james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
- copied, changed from r1026947, james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.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
- copied, changed from r1026947, james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java
- copied, changed from r1026947, james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.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/RemoteManagerTest.java
- copied, changed from r1026947, james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/NioRemoteManagerTest.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
- copied, changed from r1026947, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java
- copied, changed from r1026947, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerMBean.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
- copied, changed from r1026947, james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/NioSMTPServerTest.java
Removed:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/NioRemoteManagerTest.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerMBean.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/NioSMTPServerTest.java
Modified:
james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchSchedulerMBean.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java
Modified: james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/spring-beans.xml?rev=1026948&r1=1026947&r2=1026948&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/spring-beans.xml Mon Oct 25 06:02:27 2010
@@ -40,11 +40,12 @@
<entry key="org.apache.james:type=component,name=processor" value-ref="processormanagement"/>
<entry key="org.apache.james:type=component,name=virtualusertable" value-ref="virtualusertablemanagement"/>
<entry key="org.apache.james:type=component,name=usermanagement" value-ref="usermanagement"/>
+ <entry key="org.apache.james:type=component,name=fetchmail" value-ref="fetchmail"/>
</map>
</property>
<property name="assembler">
<bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- <property name="managedInterfaces" value="org.apache.james.smtpserver.SMTPServerMBean,org.apache.james.socket.ServerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.api.ProcessorManagementMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean"/>
+ <property name="managedInterfaces" value="org.apache.james.smtpserver.netty.SMTPServerMBean,org.apache.james.remotemanager.netty.RemoteManagerMBean,org.apache.james.pop3server.netty.POP3ServerMBean,org.apache.james.imapserver.netty.IMAPServerMBean,org.apache.james.fetchmail.FetchMailSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.mailetcontainer.api.ProcessorManagementMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean"/>
</bean>
</property>
</bean>
@@ -175,7 +176,7 @@
<bean id="dnsservice" class="org.apache.james.dnsservice.dnsjava.DNSJavaService" />
<!-- Async RemoteManager -->
- <bean id="remotemanager" class="org.apache.james.remotemanager.netty.NioRemoteManager" >
+ <bean id="remotemanager" class="org.apache.james.remotemanager.netty.RemoteManager" >
<property name="protocolHandlerChain" ref="remoteProtocolHandlerChain"/>
</bean>
@@ -184,7 +185,7 @@
</bean>
<!-- Async POP3 Server -->
- <bean id="pop3server" class="org.apache.james.pop3server.netty.NioPOP3Server" >
+ <bean id="pop3server" class="org.apache.james.pop3server.netty.POP3Server" >
<property name="protocolHandlerChain" ref="pop3ProtocolHandlerChain"/>
</bean>
@@ -193,7 +194,7 @@
</bean>
<!-- Async SMTP Server -->
- <bean id="smtpserver" class="org.apache.james.smtpserver.netty.NioSMTPServer">
+ <bean id="smtpserver" class="org.apache.james.smtpserver.netty.SMTPServer">
<property name="protocolHandlerChain" ref="smtpProtocolHandlerChain"/>
</bean>
@@ -202,7 +203,7 @@
</bean>
<!-- Async LMTP Server -->
- <bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.NioLMTPServer">
+ <bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.LMTPServer">
<property name="protocolHandlerChain" ref="lmtpProtocolHandlerChain"/>
</bean>
@@ -244,7 +245,7 @@
<bean id="domainlist" class="org.apache.james.domainlist.lib.JamesDomainList" />
<!-- IMAP server Beans -->
- <bean id="imapserver" class="org.apache.james.imapserver.netty.NioImapServer">
+ <bean id="imapserver" class="org.apache.james.imapserver.netty.IMAPServer">
<property name="imapDecoder" ref="imapDecoder"/>
<property name="imapEncoder" ref="imapEncoder"/>
</bean>
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchSchedulerMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchSchedulerMBean.java?rev=1026948&r1=1026947&r2=1026948&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchSchedulerMBean.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchSchedulerMBean.java Mon Oct 25 06:02:27 2010
@@ -24,13 +24,9 @@ package org.apache.james.fetchmail;
/**
* An interface to expose James management functionality through JMX.
*
- * @phoenix:mx-topic name="FetchScheduler,type=Mail"
*/
public interface FetchSchedulerMBean {
/**
- * @phoenix:mx-attribute
- * @phoenix:mx-description Returns flag indicating it this service is enabled
- * @phoenix:mx-isWriteable no
*
* @return boolean The enabled flag
*/
Copied: james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java (from r1026947, james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java?p2=james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java&p1=james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java (original)
+++ james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java Mon Oct 25 06:02:27 2010
@@ -32,7 +32,6 @@ 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.ServerMBean;
import org.apache.james.socket.netty.AbstractConfigurableAsyncServer;
import org.apache.james.socket.netty.ConnectionCountHandler;
import org.jboss.netty.channel.ChannelPipeline;
@@ -47,7 +46,7 @@ import org.jboss.netty.util.HashedWheelT
* NIO IMAP Server which use Netty
*
*/
-public class NioImapServer extends AbstractConfigurableAsyncServer implements ImapConstants, ServerMBean {
+public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapConstants, IMAPServerMBean {
private static final String softwaretype = "JAMES "+VERSION+" Server ";
private final ConnectionCountHandler countHandler = new ConnectionCountHandler();
@@ -110,9 +109,9 @@ public class NioImapServer extends Abstr
ChannelPipeline pipeline = pipeline();
pipeline.addLast("groupHandler", groupHandler);
pipeline.addLast("timeoutHandler", new TimeoutHandler(timer, TIMEOUT));
- pipeline.addLast("connectionLimit", new ConnectionLimitUpstreamHandler(NioImapServer.this.connectionLimit));
+ pipeline.addLast("connectionLimit", new ConnectionLimitUpstreamHandler(IMAPServer.this.connectionLimit));
- pipeline.addLast("connectionPerIpLimit", new ConnectionPerIpLimitUpstreamHandler(NioImapServer.this.connPerIP));
+ pipeline.addLast("connectionPerIpLimit", new ConnectionPerIpLimitUpstreamHandler(IMAPServer.this.connPerIP));
if (isSSLSocket()) {
// We need to set clientMode to false.
@@ -127,9 +126,9 @@ public class NioImapServer extends Abstr
final ImapRequestStreamHandler handler = new ImapRequestStreamHandler(decoder, processor, encoder);
if (isStartTLSSupported()) {
- pipeline.addLast("coreHandler", new ImapStreamChannelUpstreamHandler(hello, handler, getLogger(), NioImapServer.this.getTimeout(), getSSLContext().createSSLEngine()));
+ pipeline.addLast("coreHandler", new ImapStreamChannelUpstreamHandler(hello, handler, getLogger(), IMAPServer.this.getTimeout(), getSSLContext().createSSLEngine()));
} else {
- pipeline.addLast("coreHandler", new ImapStreamChannelUpstreamHandler(hello, handler, getLogger(), NioImapServer.this.getTimeout()));
+ pipeline.addLast("coreHandler", new ImapStreamChannelUpstreamHandler(hello, handler, getLogger(), IMAPServer.this.getTimeout()));
}
return pipeline;
Added: 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=1026948&view=auto
==============================================================================
--- james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServerMBean.java (added)
+++ james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServerMBean.java Mon Oct 25 06:02:27 2010
@@ -0,0 +1,25 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.imapserver.netty;
+
+import org.apache.james.socket.ServerMBean;
+
+public interface IMAPServerMBean extends ServerMBean{
+
+}
Copied: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java (from r1026947, james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java?p2=james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java&p1=james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/NioLMTPServer.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java Mon Oct 25 06:02:27 2010
@@ -27,7 +27,6 @@ import org.apache.james.protocols.api.Pr
import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.services.MailServer;
-import org.apache.james.smtpserver.SMTPServerMBean;
import org.apache.james.smtpserver.netty.SMTPChannelUpstreamHandler;
import org.apache.james.smtpserver.netty.SMTPResponseEncoder;
import org.apache.james.socket.netty.AbstractConfigurableAsyncServer;
@@ -38,7 +37,7 @@ import org.jboss.netty.channel.ChannelUp
import org.jboss.netty.channel.group.ChannelGroup;
import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
-public class NioLMTPServer extends AbstractConfigurableAsyncServer implements SMTPServerMBean{
+public class LMTPServer extends AbstractConfigurableAsyncServer implements LMTPServerMBean{
/**
* The maximum message size allowed by this SMTP server. The default
@@ -111,10 +110,10 @@ public class NioLMTPServer extends Abstr
* @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName()
*/
public String getHelloName() {
- if (NioLMTPServer.this.getHelloName() == null) {
- return NioLMTPServer.this.mailServer.getHelloName();
+ if (LMTPServer.this.getHelloName() == null) {
+ return LMTPServer.this.mailServer.getHelloName();
} else {
- return NioLMTPServer.this.getHelloName();
+ return LMTPServer.this.getHelloName();
}
}
@@ -129,7 +128,7 @@ public class NioLMTPServer extends Abstr
* @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
*/
public long getMaxMessageSize() {
- return NioLMTPServer.this.maxMessageSize;
+ return LMTPServer.this.maxMessageSize;
}
/**
@@ -151,7 +150,7 @@ public class NioLMTPServer extends Abstr
* @see org.apache.james.protocols.smtp.SMTPConfiguration#getSMTPGreeting()
*/
public String getSMTPGreeting() {
- return NioLMTPServer.this.lmtpGreeting;
+ return LMTPServer.this.lmtpGreeting;
}
/**
Added: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java?rev=1026948&view=auto
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java (added)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java Mon Oct 25 06:02:27 2010
@@ -0,0 +1,25 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.lmtpserver.netty;
+
+import org.apache.james.smtpserver.netty.SMTPServerMBean;
+
+public interface LMTPServerMBean extends SMTPServerMBean{
+
+}
Copied: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java (from r1026947, james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java?p2=james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java&p1=james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java Mon Oct 25 06:02:27 2010
@@ -27,7 +27,6 @@ import org.apache.james.pop3server.POP3H
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
import org.apache.james.services.MailServer;
-import org.apache.james.socket.ServerMBean;
import org.apache.james.socket.netty.AbstractConfigurableAsyncServer;
import org.apache.james.socket.netty.ConnectionCountHandler;
import org.jboss.netty.channel.ChannelPipeline;
@@ -41,7 +40,7 @@ import org.jboss.netty.handler.codec.one
*
*
*/
-public class NioPOP3Server extends AbstractConfigurableAsyncServer implements ServerMBean{
+public class POP3Server extends AbstractConfigurableAsyncServer implements POP3ServerMBean{
/**
* The number of bytes to read before resetting the connection timeout
* timer. Defaults to 20 KB.
@@ -102,10 +101,10 @@ public class NioPOP3Server extends Abstr
* @see org.apache.james.pop3server.POP3HandlerConfigurationData#getHelloName()
*/
public String getHelloName() {
- if (NioPOP3Server.this.getHelloName() == null) {
- return NioPOP3Server.this.mailServer.getHelloName();
+ if (POP3Server.this.getHelloName() == null) {
+ return POP3Server.this.mailServer.getHelloName();
} else {
- return NioPOP3Server.this.getHelloName();
+ return POP3Server.this.getHelloName();
}
}
@@ -113,14 +112,14 @@ public class NioPOP3Server extends Abstr
* @see org.apache.james.pop3server.POP3HandlerConfigurationData#getResetLength()
*/
public int getResetLength() {
- return NioPOP3Server.this.lengthReset;
+ return POP3Server.this.lengthReset;
}
/**
* @see org.apache.james.pop3server.POP3HandlerConfigurationData#isStartTLSSupported()
*/
public boolean isStartTLSSupported() {
- return NioPOP3Server.this.isStartTLSSupported();
+ return POP3Server.this.isStartTLSSupported();
}
}
@@ -145,13 +144,13 @@ public class NioPOP3Server extends Abstr
@Override
protected SSLContext getSSLContext() {
- return NioPOP3Server.this.getSSLContext();
+ return POP3Server.this.getSSLContext();
}
@Override
protected boolean isSSLSocket() {
- return NioPOP3Server.this.isSSLSocket();
+ return POP3Server.this.isSSLSocket();
}
@Override
Added: 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=1026948&view=auto
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java (added)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java Mon Oct 25 06:02:27 2010
@@ -0,0 +1,25 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.pop3server.netty;
+
+import org.apache.james.socket.ServerMBean;
+
+public interface POP3ServerMBean extends ServerMBean{
+
+}
Copied: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (from r1026947, james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?p2=james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java&p1=james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java Mon Oct 25 06:02:27 2010
@@ -20,11 +20,11 @@
package org.apache.james.pop3server;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.pop3server.netty.NioPOP3Server;
+import org.apache.james.pop3server.netty.POP3Server;
-public class NioPOP3ServerTest extends AbstractAsyncPOP3ServerTest{
+public class POP3ServerTest extends AbstractAsyncPOP3ServerTest{
- private NioPOP3Server m_pop3Server;
+ private POP3Server m_pop3Server;
@Override
protected void initPOP3Server(POP3TestConfiguration testConfiguration) throws Exception {
@@ -35,7 +35,7 @@ public class NioPOP3ServerTest extends A
@Override
protected void setUpPOP3Server() throws Exception {
- m_pop3Server = new NioPOP3Server();
+ m_pop3Server = new POP3Server();
m_pop3Server.setDNSService(dnsservice);
m_pop3Server.setFileSystem(fSystem);
m_pop3Server.setProtocolHandlerChain(chain);
Copied: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java (from r1026947, james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java?p2=james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java&p1=james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NioRemoteManager.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManager.java Mon Oct 25 06:02:27 2010
@@ -31,7 +31,6 @@ import org.apache.james.protocols.api.Pr
import org.apache.james.protocols.impl.AbstractChannelPipelineFactory;
import org.apache.james.remotemanager.RemoteManagerHandlerConfigurationData;
import org.apache.james.services.MailServer;
-import org.apache.james.socket.ServerMBean;
import org.apache.james.socket.netty.AbstractConfigurableAsyncServer;
import org.apache.james.socket.netty.ConnectionCountHandler;
import org.jboss.netty.channel.ChannelPipeline;
@@ -45,7 +44,7 @@ import org.jboss.netty.handler.codec.one
* NIO RemoteManager which use Netty
*
*/
-public class NioRemoteManager extends AbstractConfigurableAsyncServer implements ServerMBean{
+public class RemoteManager extends AbstractConfigurableAsyncServer implements RemoteManagerMBean{
private Map<String,String> adminAccounts = new HashMap<String, String>();
@@ -101,9 +100,9 @@ public class NioRemoteManager extends Ab
*/
public String getHelloName() {
if (getHelloName() == null) {
- return NioRemoteManager.this.mailServer.getHelloName();
+ return RemoteManager.this.mailServer.getHelloName();
} else {
- return NioRemoteManager.this.getHelloName();
+ return RemoteManager.this.getHelloName();
}
}
@@ -111,7 +110,7 @@ public class NioRemoteManager extends Ab
* @see org.apache.james.remotemanager.RemoteManagerHandlerConfigurationData#getAdministrativeAccountData()
*/
public Map<String,String> getAdministrativeAccountData() {
- return NioRemoteManager.this.adminAccounts;
+ return RemoteManager.this.adminAccounts;
}
/**
Added: 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=1026948&view=auto
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerMBean.java (added)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerMBean.java Mon Oct 25 06:02:27 2010
@@ -0,0 +1,25 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.remotemanager.netty;
+
+import org.apache.james.socket.ServerMBean;
+
+public interface RemoteManagerMBean extends ServerMBean{
+
+}
Copied: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java (from r1026947, james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/NioRemoteManagerTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java?p2=james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java&p1=james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/NioRemoteManagerTest.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/NioRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java Mon Oct 25 06:02:27 2010
@@ -19,10 +19,10 @@
package org.apache.james.remotemanager;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.remotemanager.netty.NioRemoteManager;
+import org.apache.james.remotemanager.netty.RemoteManager;
-public class NioRemoteManagerTest extends AbstractRemoteManagerTest{
- private NioRemoteManager remotemanager;
+public class RemoteManagerTest extends AbstractRemoteManagerTest{
+ private RemoteManager remotemanager;
@Override
protected void initRemoteManager(RemoteManagerTestConfiguration testConfiguration) throws Exception {
@@ -33,7 +33,7 @@ public class NioRemoteManagerTest extend
@Override
protected void setUpRemoteManager() throws Exception {
- remotemanager = new NioRemoteManager();
+ remotemanager = new RemoteManager();
remotemanager.setDNSService(dnsservice);
remotemanager.setFileSystem(filesystem);
remotemanager.setProtocolHandlerChain(chain);
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java?rev=1026948&r1=1026947&r2=1026948&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java Mon Oct 25 06:02:27 2010
@@ -31,7 +31,7 @@ import org.apache.james.protocols.impl.A
import org.apache.james.protocols.impl.LineHandlerUpstreamHandler;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.smtpserver.netty.NioSMTPServer.SMTPHandlerConfigurationDataImpl;
+import org.apache.james.smtpserver.netty.SMTPServer.SMTPHandlerConfigurationDataImpl;
import org.jboss.netty.channel.ChannelHandlerContext;
/**
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java (from r1026947, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/NioSMTPServer.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java Mon Oct 25 06:02:27 2010
@@ -28,7 +28,6 @@ import org.apache.james.protocols.api.Pr
import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.services.MailServer;
-import org.apache.james.smtpserver.SMTPServerMBean;
import org.apache.james.socket.netty.AbstractConfigurableAsyncServer;
import org.apache.james.socket.netty.ConnectionCountHandler;
import org.apache.james.util.netmatcher.NetMatcher;
@@ -43,7 +42,7 @@ import org.jboss.netty.handler.codec.one
*
*
*/
-public class NioSMTPServer extends AbstractConfigurableAsyncServer implements SMTPServerMBean{
+public class SMTPServer extends AbstractConfigurableAsyncServer implements SMTPServerMBean{
/**
@@ -218,10 +217,10 @@ public class NioSMTPServer extends Abstr
* @see org.apache.james.protocols.smtp.SMTPConfiguration#getHelloName()
*/
public String getHelloName() {
- if (NioSMTPServer.this.getHelloName() == null) {
- return NioSMTPServer.this.mailServer.getHelloName();
+ if (SMTPServer.this.getHelloName() == null) {
+ return SMTPServer.this.mailServer.getHelloName();
} else {
- return NioSMTPServer.this.getHelloName();
+ return SMTPServer.this.getHelloName();
}
}
@@ -229,14 +228,14 @@ public class NioSMTPServer extends Abstr
* @see org.apache.james.protocols.smtp.SMTPConfiguration#getResetLength()
*/
public int getResetLength() {
- return NioSMTPServer.this.lengthReset;
+ return SMTPServer.this.lengthReset;
}
/**
* @see org.apache.james.protocols.smtp.SMTPConfiguration#getMaxMessageSize()
*/
public long getMaxMessageSize() {
- return NioSMTPServer.this.maxMessageSize;
+ return SMTPServer.this.maxMessageSize;
}
/**
@@ -245,7 +244,7 @@ public class NioSMTPServer extends Abstr
public boolean isRelayingAllowed(String remoteIP) {
boolean relayingAllowed = false;
if (authorizedNetworks != null) {
- relayingAllowed = NioSMTPServer.this.authorizedNetworks.matchInetNetwork(remoteIP);
+ relayingAllowed = SMTPServer.this.authorizedNetworks.matchInetNetwork(remoteIP);
}
return relayingAllowed;
}
@@ -254,7 +253,7 @@ public class NioSMTPServer extends Abstr
* @see org.apache.james.protocols.smtp.SMTPConfiguration#useHeloEhloEnforcement()
*/
public boolean useHeloEhloEnforcement() {
- return NioSMTPServer.this.heloEhloEnforcement;
+ return SMTPServer.this.heloEhloEnforcement;
}
@@ -262,24 +261,24 @@ public class NioSMTPServer extends Abstr
* @see org.apache.james.protocols.smtp.SMTPConfiguration#getSMTPGreeting()
*/
public String getSMTPGreeting() {
- return NioSMTPServer.this.smtpGreeting;
+ return SMTPServer.this.smtpGreeting;
}
/**
* @see org.apache.james.protocols.smtp.SMTPConfiguration#useAddressBracketsEnforcement()
*/
public boolean useAddressBracketsEnforcement() {
- return NioSMTPServer.this.addressBracketsEnforcement;
+ return SMTPServer.this.addressBracketsEnforcement;
}
/**
* @see org.apache.james.protocols.smtp.SMTPConfiguration#isAuthRequired(java.lang.String)
*/
public boolean isAuthRequired(String remoteIP) {
- if (NioSMTPServer.this.authRequired == AUTH_ANNOUNCE) return true;
- boolean authRequired = NioSMTPServer.this.authRequired != AUTH_DISABLED;
+ if (SMTPServer.this.authRequired == AUTH_ANNOUNCE) return true;
+ boolean authRequired = SMTPServer.this.authRequired != AUTH_DISABLED;
if (authorizedNetworks != null) {
- authRequired = authRequired && !NioSMTPServer.this.authorizedNetworks.matchInetNetwork(remoteIP);
+ authRequired = authRequired && !SMTPServer.this.authorizedNetworks.matchInetNetwork(remoteIP);
}
return authRequired;
}
@@ -288,7 +287,7 @@ public class NioSMTPServer extends Abstr
* @see org.apache.james.protocols.smtp.SMTPConfiguration#isStartTLSSupported()
*/
public boolean isStartTLSSupported() {
- return NioSMTPServer.this.isStartTLSSupported();
+ return SMTPServer.this.isStartTLSSupported();
}
/**
@@ -297,7 +296,7 @@ public class NioSMTPServer extends Abstr
* @return verify
*/
public boolean verifyIdentity() {
- return NioSMTPServer.this.verifyIdentity;
+ return SMTPServer.this.verifyIdentity;
}
}
@@ -327,12 +326,12 @@ public class NioSMTPServer extends Abstr
@Override
protected SSLContext getSSLContext() {
- return NioSMTPServer.this.getSSLContext();
+ return SMTPServer.this.getSSLContext();
}
@Override
protected boolean isSSLSocket() {
- return NioSMTPServer.this.isSSLSocket();
+ return SMTPServer.this.isSSLSocket();
}
@Override
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java (from r1026947, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerMBean.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerMBean.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerMBean.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java Mon Oct 25 06:02:27 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver;
+package org.apache.james.smtpserver.netty;
import org.apache.james.socket.ServerMBean;
Copied: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (from r1026947, james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/NioSMTPServerTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?p2=james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java&p1=james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/NioSMTPServerTest.java&r1=1026947&r2=1026948&rev=1026948&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/NioSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Mon Oct 25 06:02:27 2010
@@ -22,11 +22,11 @@ package org.apache.james.smtpserver;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.james.protocols.impl.AbstractChannelPipelineFactory;
-import org.apache.james.smtpserver.netty.NioSMTPServer;
+import org.apache.james.smtpserver.netty.SMTPServer;
-public class NioSMTPServerTest extends AbstractSMTPServerTest{
+public class SMTPServerTest extends AbstractSMTPServerTest{
- private NioSMTPServer m_smtpServer;
+ private SMTPServer m_smtpServer;
@Override
protected void initSMTPServer(SMTPTestConfiguration testConfiguration) throws Exception {
@@ -39,7 +39,7 @@ public class NioSMTPServerTest extends A
protected void setUpSMTPServer() throws Exception {
SimpleLog log = new SimpleLog("SMTP");
log.setLevel(SimpleLog.LOG_LEVEL_ALL);
- m_smtpServer = new NioSMTPServer();
+ m_smtpServer = new SMTPServer();
m_smtpServer.setDNSService(m_dnsServer);
m_smtpServer.setFileSystem(fileSystem);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org