Author: bago Date: Wed Oct 14 11:19:54 2009 New Revision: 825086 URL: http://svn.apache.org/viewvc?rev=825086&view=rev Log: Avoid direct access to super class fields for our servers as we want to remove inheritance (JAMES-930)
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java?rev=825086&r1=825085&r2=825086&view=diff ============================================================================== --- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java (original) +++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AbstractProtocolServer.java Wed Oct 14 11:19:54 2009 @@ -942,5 +942,9 @@ return useStartTLS; } + public String getHelloName() { + return helloName; + } + } Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java?rev=825086&r1=825085&r2=825086&view=diff ============================================================================== --- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java (original) +++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java Wed Oct 14 11:19:54 2009 @@ -86,13 +86,13 @@ public void configure( final Configuration configuration ) throws ConfigurationException { super.configure( configuration ); factory.configure(configuration); - hello = softwaretype + " Server " + helloName + " is ready."; + hello = softwaretype + " Server " + getHelloName() + " is ready."; } /** * @see AbstractProtocolServer#getDefaultPort() */ - protected int getDefaultPort() { + public int getDefaultPort() { return 143; } Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java?rev=825086&r1=825085&r2=825086&view=diff ============================================================================== --- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java (original) +++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServer.java Wed Oct 14 11:19:54 2009 @@ -120,7 +120,7 @@ /** * @see org.apache.james.socket.AbstractProtocolServer#getDefaultPort() */ - protected int getDefaultPort() { + public int getDefaultPort() { return 119; } @@ -149,10 +149,10 @@ * @see org.apache.james.nntpserver.NNTPHandlerConfigurationData#getHelloName() */ public String getHelloName() { - if (NNTPServer.this.helloName == null) { + if (NNTPServer.this.getHelloName() == null) { return NNTPServer.this.mailServer.getHelloName(); } else { - return NNTPServer.this.helloName; + return NNTPServer.this.getHelloName(); } } Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java?rev=825086&r1=825085&r2=825086&view=diff ============================================================================== --- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java (original) +++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java Wed Oct 14 11:19:54 2009 @@ -140,7 +140,7 @@ /** * @see org.apache.james.socket.AbstractProtocolServer#getDefaultPort() */ - protected int getDefaultPort() { + public int getDefaultPort() { return 110; } @@ -170,10 +170,10 @@ * @see org.apache.james.pop3server.POP3HandlerConfigurationData#getHelloName() */ public String getHelloName() { - if (POP3Server.this.helloName == null) { + if (POP3Server.this.getHelloName() == null) { return POP3Server.this.mailServer.getHelloName(); } else { - return POP3Server.this.helloName; + return POP3Server.this.getHelloName(); } } Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java?rev=825086&r1=825085&r2=825086&view=diff ============================================================================== --- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java (original) +++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java Wed Oct 14 11:19:54 2009 @@ -164,7 +164,7 @@ /** * @see org.apache.james.socket.AbstractProtocolServer#getDefaultPort() */ - protected int getDefaultPort() { + public int getDefaultPort() { return 4555; } @@ -192,10 +192,10 @@ * @see org.apache.james.remotemanager.RemoteManagerHandlerConfigurationData#getHelloName() */ public String getHelloName() { - if (RemoteManager.this.helloName == null) { + if (RemoteManager.this.getHelloName() == null) { return RemoteManager.this.mailServer.getHelloName(); } else { - return RemoteManager.this.helloName; + return RemoteManager.this.getHelloName(); } } Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=825086&r1=825085&r2=825086&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java Wed Oct 14 11:19:54 2009 @@ -155,7 +155,7 @@ if (isEnabled()) { // TODO Remove this in next not backwards compatible release! - if (hello == null) mailetcontext.setAttribute(Constants.HELLO_NAME, helloName); + if (hello == null) mailetcontext.setAttribute(Constants.HELLO_NAME, getHelloName()); handlerConfiguration = configuration.getChild("handler"); String authRequiredString = handlerConfiguration.getChild("authRequired").getValue("false").trim().toLowerCase(); @@ -250,7 +250,7 @@ /** * @see org.apache.james.core.AbstractProtocolServer#getDefaultPort() */ - protected int getDefaultPort() { + public int getDefaultPort() { return 25; } @@ -262,16 +262,6 @@ } /** - * @see org.apache.avalon.excalibur.pool.ObjectFactory#getCreatedClass() - */ - @SuppressWarnings("unchecked") - public Class getCreatedClass() { - return SMTPHandler.class; - } - - - - /** * A class to provide SMTP handler configuration to the handlers */ private class SMTPHandlerConfigurationDataImpl implements SMTPConfiguration { @@ -280,10 +270,10 @@ * @see org.apache.james.smtpserver.SMTPConfiguration#getHelloName() */ public String getHelloName() { - if (SMTPServer.this.helloName == null) { + if (SMTPServer.this.getHelloName() == null) { return SMTPServer.this.mailServer.getHelloName(); } else { - return SMTPServer.this.helloName; + return SMTPServer.this.getHelloName(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org