You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/03/12 15:07:26 UTC
svn commit: r636333 - in /mina/ftpserver/trunk/core/src:
main/java/org/apache/ftpserver/ main/java/org/apache/ftpserver/interfaces/
main/java/org/apache/ftpserver/listener/mina/ test/java/org/apache/ftpserver/
Author: ngn
Date: Wed Mar 12 07:07:21 2008
New Revision: 636333
URL: http://svn.apache.org/viewvc?rev=636333&view=rev
Log:
Making handlers and listeners pluggable and better adapted to DI containers
Added:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java
- copied, changed from r636265, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/FtpHandlerAdapter.java
Removed:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java?rev=636333&r1=636332&r2=636333&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java Wed Mar 12 07:07:21 2008
@@ -349,7 +349,7 @@
}
}
- public Listener[] getListeners() {
+ public Listener[] getAllListeners() {
Collection<Bean> listenerBeans = listeners.values();
Iterator<Bean> listenerIter = listenerBeans.iterator();
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java (from r636265, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java&r1=636265&r2=636333&rev=636333&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java Wed Mar 12 07:07:21 2008
@@ -1,3 +1,22 @@
+/*
+ * 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.ftpserver;
import java.io.IOException;
@@ -12,63 +31,43 @@
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class FtpHandler extends IoHandlerAdapter
-{
-
+public class DefaultFtpHandler implements FtpHandler {
-
- private final Logger LOG = LoggerFactory.getLogger(FtpHandler.class);
+ private final Logger LOG = LoggerFactory.getLogger(DefaultFtpHandler.class);
private FtpServerContext context;
private Listener listener;
-
- public FtpHandler(FtpServerContext context, Listener listener) {
- this.context = context;
- this.listener = listener;
- }
+ public void init(FtpServerContext context, Listener listener) {
+ this.context = context;
+ this.listener = listener;
+ }
- public void sessionCreated(IoSession session) throws Exception {
- FtpIoSession ftpSession = new FtpIoSession(session, context);
- ftpSession.setListener(listener);
+ public void sessionCreated(FtpIoSession session) throws Exception {
+ session.setListener(listener);
}
- public void sessionOpened(IoSession session) throws Exception {
- FtpIoSession ftpSession = new FtpIoSession(session, context);
-
- session.write(FtpReplyUtil.translate(ftpSession, null, context, FtpReply.REPLY_220_SERVICE_READY, null, null));
+ public void sessionOpened(FtpIoSession session) throws Exception {
+ session.write(FtpReplyUtil.translate(session, null, context, FtpReply.REPLY_220_SERVICE_READY, null, null));
}
- public void sessionClosed(IoSession session) throws Exception {
- FtpIoSession ftpSession = new FtpIoSession(session, context);
-
+ public void sessionClosed(FtpIoSession session) throws Exception {
ServerFtpStatistics stats = ((ServerFtpStatistics)context.getFtpStatistics());
if(stats != null) {
- stats.setLogout(ftpSession);
+ stats.setLogout(session);
}
}
-
- @Override
- public void exceptionCaught( IoSession session, Throwable cause ) throws Exception
- {
+ public void exceptionCaught( FtpIoSession session, Throwable cause ) throws Exception {
LOG.error("Exception caught, closing session", cause);
session.closeOnFlush().awaitUninterruptibly(10000);
}
- @Override
- public void messageReceived( IoSession session, Object message ) throws Exception
- {
- FtpRequest request = new FtpRequestImpl(message.toString());
-
- FtpIoSession ftpSession = new FtpIoSession(session, context);
-
+ public void messageReceived( FtpIoSession session, FtpRequest request ) throws Exception {
try {
String commandName = request.getCommand();
CommandFactory commandFactory = context.getCommandFactory();
@@ -77,18 +76,18 @@
if(command != null) {
synchronized (session) {
- command.execute(ftpSession, context, request);
+ command.execute(session, context, request);
}
}
else {
- session.write(FtpReplyUtil.translate(ftpSession, request, context, FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED, "not.implemented", null));
+ session.write(FtpReplyUtil.translate(session, request, context, FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED, "not.implemented", null));
}
}
catch(Exception ex) {
// send error reply
try {
- session.write(FtpReplyUtil.translate(ftpSession, request, context, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, null, null));
+ session.write(FtpReplyUtil.translate(session, request, context, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, null, null));
}
catch(Exception ex1) {
}
@@ -103,10 +102,14 @@
}
- @Override
- public void sessionIdle( IoSession session, IdleStatus status ) throws Exception
- {
+ public void sessionIdle( FtpIoSession session, IdleStatus status ) throws Exception {
LOG.info("Session idle, closing");
session.closeOnFlush().awaitUninterruptibly(10000);
}
+
+ public void messageSent(FtpIoSession session, FtpReply reply)
+ throws Exception {
+ // do nothing
+
+ }
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java?rev=636333&r1=636332&r2=636333&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java Wed Mar 12 07:07:21 2008
@@ -19,6 +19,7 @@
package org.apache.ftpserver;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -290,12 +291,20 @@
return listeners.get(name);
}
- public Listener[] getListeners() {
+ public Listener[] getAllListeners() {
Collection<Listener> listenerList = listeners.values();
Listener[] listenerArray = new Listener[0];
return listenerList.toArray(listenerArray);
+ }
+
+ public Map<String, Listener> getListeners() {
+ return listeners;
+ }
+
+ public void setListeners(Map<String, Listener> listeners) {
+ this.listeners = listeners;
}
public void addListener(String name, Listener listener) {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java?rev=636333&r1=636332&r2=636333&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java Wed Mar 12 07:07:21 2008
@@ -61,7 +61,7 @@
* Start the server. Open a new listener thread.
*/
public void start() throws Exception {
- Listener[] listeners = serverContext.getListeners();
+ Listener[] listeners = serverContext.getAllListeners();
for (int i = 0; i<listeners.length; i++) {
listeners[i].start(serverContext);
}
@@ -82,7 +82,7 @@
}
// stop all listeners
- Listener[] listeners = serverContext.getListeners();
+ Listener[] listeners = serverContext.getAllListeners();
for (int i = 0; i<listeners.length; i++) {
listeners[i].stop();
}
@@ -109,7 +109,7 @@
*/
public void suspend() {
// stop all listeners
- Listener[] listeners = serverContext.getListeners();
+ Listener[] listeners = serverContext.getAllListeners();
for (int i = 0; i<listeners.length; i++) {
listeners[i].suspend();
}
@@ -121,7 +121,7 @@
* Resume the server handler
*/
public void resume() {
- Listener[] listeners = serverContext.getListeners();
+ Listener[] listeners = serverContext.getAllListeners();
for (int i = 0; i<listeners.length; i++) {
listeners[i].resume();
}
@@ -142,4 +142,8 @@
public FtpServerContext getServerContext() {
return serverContext;
}
+
+ public void setServerContext(FtpServerContext serverContext) {
+ this.serverContext = serverContext;
+ }
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java?rev=636333&r1=636332&r2=636333&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java Wed Mar 12 07:07:21 2008
@@ -53,7 +53,7 @@
Listener getListener(String name);
- Listener[] getListeners();
+ Listener[] getAllListeners();
/**
* Get the command factory.
Added: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/FtpHandlerAdapter.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/FtpHandlerAdapter.java?rev=636333&view=auto
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/FtpHandlerAdapter.java (added)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/FtpHandlerAdapter.java Wed Mar 12 07:07:21 2008
@@ -0,0 +1,84 @@
+/*
+ * 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.ftpserver.listener.mina;
+
+import org.apache.ftpserver.FtpHandler;
+import org.apache.ftpserver.FtpRequestImpl;
+import org.apache.ftpserver.ftplet.FtpReply;
+import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.interfaces.FtpIoSession;
+import org.apache.ftpserver.interfaces.FtpServerContext;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoSession;
+
+public class FtpHandlerAdapter implements IoHandler
+{
+ private FtpServerContext context;
+ private FtpHandler ftpHandler;
+
+ public FtpHandlerAdapter(FtpServerContext context,
+ FtpHandler ftpHandler) {
+ this.context = context;
+ this.ftpHandler = ftpHandler;
+ }
+
+ public void exceptionCaught(IoSession session, Throwable cause)
+ throws Exception {
+ FtpIoSession ftpSession = new FtpIoSession(session, context);
+ ftpHandler.exceptionCaught(ftpSession, cause);
+ }
+
+ public void messageReceived(IoSession session, Object message)
+ throws Exception {
+ FtpIoSession ftpSession = new FtpIoSession(session, context);
+ FtpRequest request = new FtpRequestImpl(message.toString());
+
+ ftpHandler.messageReceived(ftpSession, request);
+ }
+
+ public void messageSent(IoSession session, Object message) throws Exception {
+ FtpIoSession ftpSession = new FtpIoSession(session, context);
+ ftpHandler.messageSent(ftpSession, (FtpReply)message);
+ }
+
+ public void sessionClosed(IoSession session) throws Exception {
+ FtpIoSession ftpSession = new FtpIoSession(session, context);
+ ftpHandler.sessionClosed(ftpSession);
+ }
+
+ public void sessionCreated(IoSession session) throws Exception {
+ FtpIoSession ftpSession = new FtpIoSession(session, context);
+ ftpHandler.sessionCreated(ftpSession);
+ }
+
+ public void sessionIdle(IoSession session, IdleStatus status)
+ throws Exception {
+ FtpIoSession ftpSession = new FtpIoSession(session, context);
+ ftpHandler.sessionIdle(ftpSession, status);
+ }
+
+ public void sessionOpened(IoSession session) throws Exception {
+ FtpIoSession ftpSession = new FtpIoSession(session, context);
+ ftpHandler.sessionOpened(ftpSession);
+ }
+
+
+}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java?rev=636333&r1=636332&r2=636333&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/MinaListener.java Wed Mar 12 07:07:21 2008
@@ -25,6 +25,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.apache.ftpserver.DefaultFtpHandler;
import org.apache.ftpserver.FtpHandler;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.listener.AbstractListener;
@@ -59,7 +60,10 @@
private ExecutorService filterExecutor = Executors.newCachedThreadPool();
- /**
+ private FtpHandler handler = new DefaultFtpHandler();
+
+
+ /**
* @see Listener#start(FtpServerContext)
*/
public void start(FtpServerContext context) throws Exception {
@@ -107,7 +111,9 @@
acceptor.getFilterChain().addFirst("sslFilter", sslFilter);
}
- acceptor.setHandler( new FtpHandler(context, this) );
+
+ handler.init(context, this);
+ acceptor.setHandler(new FtpHandlerAdapter(context, handler));
acceptor.bind(address);
}
@@ -188,4 +194,12 @@
this.filterExecutor = filterExecutor;
}
+
+ public FtpHandler getHandler() {
+ return handler;
+ }
+
+ public void setHandler(FtpHandler handler) {
+ this.handler = handler;
+ }
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java?rev=636333&r1=636332&r2=636333&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java Wed Mar 12 07:07:21 2008
@@ -46,7 +46,7 @@
assertNotNull(ctx.getListener("foo2"));
assertTrue(ctx.getListener("foo2") instanceof MinaListener);
- Listener[] listeners = ctx.getListeners();
+ Listener[] listeners = ctx.getAllListeners();
assertEquals(2, listeners.length);
assertTrue(listeners[0] instanceof Listener);