Author: bago
Date: Sun Oct 18 11:41:27 2009
New Revision: 826414
URL: http://svn.apache.org/viewvc?rev=826414&view=rev
Log:
Moved more code from implementations to AbstractHandlerChain
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java?rev=826414&r1=826413&r2=826414&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
Sun Oct 18 11:41:27 2009
@@ -21,8 +21,6 @@
package org.apache.james.pop3server;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.james.pop3server.core.CoreCmdHandlerLoader;
import org.apache.james.socket.shared.AbstractHandlerChain;
import org.apache.james.socket.shared.LogEnabled;
@@ -32,29 +30,7 @@
* ConnectHandlers and Commandhandlers
*/
public class POP3HandlerChain extends AbstractHandlerChain implements
LogEnabled{
-
- /** This log is the fall back shared by all instances */
- private static final Log FALLBACK_LOG =
LogFactory.getLog(POP3HandlerChain.class);
-
- /** Non context specific log should only be used when no context specific
log is available */
- private Log log = FALLBACK_LOG;
-
- /**
- * @see
org.apache.james.socket.shared.LogEnabled#setLog(org.apache.commons.logging.Log)
- */
- public void setLog(Log log) {
- this.log = log;
- }
-
-
- /**
- * @see org.apache.james.socket.shared.AbstractHandlerChain#getLog()
- */
- protected Log getLog() {
- return log;
- }
-
/**
* @see
org.apache.james.socket.shared.AbstractHandlerChain#getCoreCmdHandlerLoader()
*/
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java?rev=826414&r1=826413&r2=826414&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
Sun Oct 18 11:41:27 2009
@@ -19,29 +19,12 @@
package org.apache.james.remotemanager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.james.remotemanager.core.CoreCmdHandlerLoader;
import org.apache.james.socket.shared.AbstractHandlerChain;
import org.apache.james.socket.shared.LogEnabled;
public class RemoteManagerHandlerChain extends AbstractHandlerChain implements
LogEnabled{
-
- /** This log is the fall back shared by all instances */
- private static final Log FALLBACK_LOG =
LogFactory.getLog(RemoteManagerHandlerChain.class);
-
- /** Non context specific log should only be used when no context specific
log is available */
- private Log log = FALLBACK_LOG;
-
-
- /**
- * @see
org.apache.james.socket.shared.LogEnabled#setLog(org.apache.commons.logging.Log)
- */
- public void setLog(Log log) {
- this.log = log;
- }
-
/**
* (non-Javadoc)
* @see
org.apache.james.socket.shared.AbstractHandlerChain#getCoreCmdHandlerLoader()
@@ -50,11 +33,4 @@
return CoreCmdHandlerLoader.class;
}
- /**
- * @see org.apache.james.socket.shared.AbstractHandlerChain#getLog()
- */
- protected Log getLog() {
- return log;
- }
-
}
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java?rev=826414&r1=826413&r2=826414&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java
Sun Oct 18 11:41:27 2009
@@ -17,12 +17,8 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.smtpserver.protocol;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.james.smtpserver.protocol.core.CoreCmdHandlerLoader;
import org.apache.james.socket.shared.AbstractHandlerChain;
import org.apache.james.socket.shared.LogEnabled;
@@ -33,28 +29,6 @@
*/
public class SMTPHandlerChain extends AbstractHandlerChain implements
LogEnabled{
- /** This log is the fall back shared by all instances */
- private static final Log FALLBACK_LOG =
LogFactory.getLog(SMTPHandlerChain.class);
-
- /** Non context specific log should only be used when no context specific
log is available */
- private Log log = FALLBACK_LOG;
-
- /**
- * Sets the service log.
- * Where available, a context sensitive log should be used.
- * @param Log not null
- */
- public void setLog(Log log) {
- this.log = log;
- }
-
- /**
- * @see org.apache.james.socket.shared.AbstractHandlerChain#getLog()
- */
- protected Log getLog() {
- return log;
- }
-
/**
* @see
org.apache.james.socket.shared.AbstractHandlerChain#getCoreCmdHandlerLoader()
*/
Modified:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java?rev=826414&r1=826413&r2=826414&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
Sun Oct 18 11:41:27 2009
@@ -31,6 +31,7 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.socket.configuration.Configurable;
@@ -40,6 +41,29 @@
*
*/
public abstract class AbstractHandlerChain implements LogEnabled, Configurable
{
+
+ /** This log is the fall back shared by all instances */
+ private static final Log FALLBACK_LOG =
LogFactory.getLog(AbstractHandlerChain.class);
+
+ /** Non context specific log should only be used when no context specific
log is available */
+ private Log log = FALLBACK_LOG;
+
+ /**
+ * Sets the service log.
+ * Where available, a context sensitive log should be used.
+ * @param Log not null
+ */
+ public void setLog(Log log) {
+ this.log = log;
+ }
+
+ /**
+ * @see org.apache.james.socket.shared.AbstractHandlerChain#getLog()
+ */
+ protected Log getLog() {
+ return log;
+ }
+
protected final List<Object> handlers = new LinkedList<Object>();
/** Loads instances */
@@ -228,10 +252,4 @@
*/
protected abstract Class<?> getCoreCmdHandlerLoader();
- /**
- * Return the Log to use
- *
- * @return log
- */
- protected abstract Log getLog();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
