Author: ngn
Date: Wed Dec 10 14:13:23 2008
New Revision: 725462
URL: http://svn.apache.org/viewvc?rev=725462&view=rev
Log:
Upgrade to MINA 2.0.0-M4 (FTPSERVER-237)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
mina/ftpserver/trunk/pom.xml
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java?rev=725462&r1=725461&r2=725462&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
Wed Dec 10 14:13:23 2008
@@ -197,7 +197,7 @@
.getMaxLoginFailures();
if (maxAllowedLoginFailues != 0
&& session.getFailedLogins() >=
maxAllowedLoginFailues) {
- session.closeOnFlush().awaitUninterruptibly(10000);
+ session.close(false).awaitUninterruptibly(10000);
}
return;
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java?rev=725462&r1=725461&r2=725462&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java
Wed Dec 10 14:13:23 2008
@@ -51,7 +51,7 @@
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_221_CLOSING_CONTROL_CONNECTION, "QUIT", null));
- session.closeOnFlush().awaitUninterruptibly(10000);
+ session.close(false).awaitUninterruptibly(10000);
session.getDataConnection().closeDataConnection();
}
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java?rev=725462&r1=725461&r2=725462&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java
Wed Dec 10 14:13:23 2008
@@ -182,7 +182,7 @@
// if not ok - close connection
if (!success) {
- session.closeOnFlush().awaitUninterruptibly(10000);
+ session.close(false).awaitUninterruptibly(10000);
}
}
}
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java?rev=725462&r1=725461&r2=725462&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
Wed Dec 10 14:13:23 2008
@@ -97,7 +97,7 @@
LOG.error("Exception caught, closing session", cause);
}
- session.closeOnFlush().awaitUninterruptibly(10000);
+ session.close(false).awaitUninterruptibly(10000);
}
private boolean isCommandOkWithoutAuthentication(String command) {
@@ -138,7 +138,7 @@
ftpletRet = FtpletResult.DISCONNECT;
}
if (ftpletRet == FtpletResult.DISCONNECT) {
- session.closeOnFlush().awaitUninterruptibly(10000);
+ session.close(false).awaitUninterruptibly(10000);
return;
} else if (ftpletRet != FtpletResult.SKIP) {
@@ -162,7 +162,7 @@
ftpletRet = FtpletResult.DISCONNECT;
}
if (ftpletRet == FtpletResult.DISCONNECT) {
- session.closeOnFlush().awaitUninterruptibly(10000);
+ session.close(false).awaitUninterruptibly(10000);
return;
}
}
@@ -189,7 +189,7 @@
public void sessionIdle(final FtpIoSession session, final IdleStatus
status)
throws Exception {
LOG.info("Session idle, closing");
- session.closeOnFlush().awaitUninterruptibly(10000);
+ session.close(false).awaitUninterruptibly(10000);
}
public void messageSent(final FtpIoSession session, final FtpReply reply)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java?rev=725462&r1=725461&r2=725462&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
Wed Dec 10 14:13:23 2008
@@ -47,8 +47,8 @@
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionConfig;
-import org.apache.mina.core.session.TrafficMask;
import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestQueue;
import org.apache.mina.filter.ssl.SslFilter;
/**
@@ -135,13 +135,6 @@
}
/**
- * @see IoSession#closeOnFlush()
- */
- public CloseFuture closeOnFlush() {
- return wrappedSession.closeOnFlush();
- }
-
- /**
* @see IoSession#containsAttribute(Object)
*/
public boolean containsAttribute(Object key) {
@@ -370,13 +363,6 @@
}
/**
- * @see IoSession#getTrafficMask()
- */
- public TrafficMask getTrafficMask() {
- return wrappedSession.getTrafficMask();
- }
-
- /**
* @see IoSession#getTransportMetadata()
*/
public TransportMetadata getTransportMetadata() {
@@ -518,13 +504,6 @@
}
/**
- * @see IoSession#setTrafficMask(TrafficMask)
- */
- public void setTrafficMask(TrafficMask trafficMask) {
- wrappedSession.setTrafficMask(trafficMask);
- }
-
- /**
* @see IoSession#suspendRead()
*/
public void suspendRead() {
@@ -812,4 +791,39 @@
public FtpReply getLastReply() {
return lastReply;
}
+
+ /**
+ * @see IoSession#getWriteRequestQueue()
+ */
+ public WriteRequestQueue getWriteRequestQueue() {
+ return wrappedSession.getWriteRequestQueue();
+ }
+
+ /**
+ * @see IoSession#isReadSuspended()
+ */
+ public boolean isReadSuspended() {
+ return wrappedSession.isReadSuspended();
+ }
+
+ /**
+ * @see IoSession#isWriteSuspended()
+ */
+ public boolean isWriteSuspended() {
+ return wrappedSession.isWriteSuspended();
+ }
+
+ /**
+ * @see IoSession#setCurrentWriteRequest(WriteRequest)
+ */
+ public void setCurrentWriteRequest(WriteRequest currentWriteRequest) {
+ wrappedSession.setCurrentWriteRequest(currentWriteRequest);
+ }
+
+ /**
+ * @see IoSession#updateThroughput(long, boolean)
+ */
+ public void updateThroughput(long currentTime, boolean force) {
+ wrappedSession.updateThroughput(currentTime, force);
+ }
}
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java?rev=725462&r1=725461&r2=725462&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
Wed Dec 10 14:13:23 2008
@@ -21,7 +21,10 @@
import org.apache.mina.core.session.IoEventType;
import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.logging.LogLevel;
import org.apache.mina.filter.logging.LoggingFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <strong>Internal class, do not use directly.</strong>
@@ -35,18 +38,20 @@
private boolean maskPassword = true;
+ private final Logger logger;
+
/**
* @see LoggingFilter#LoggingFilter()
*/
public FtpLoggingFilter() {
- super();
+ this(FtpLoggingFilter.class.getName());
}
/**
* @see LoggingFilter#LoggingFilter(Class)
*/
public FtpLoggingFilter(Class<?> clazz) {
- super(clazz);
+ this(clazz.getName());
}
/**
@@ -54,6 +59,8 @@
*/
public FtpLoggingFilter(String name) {
super(name);
+
+ logger = LoggerFactory.getLogger(name);
}
/**
@@ -79,7 +86,7 @@
logMessage = request;
}
- log(IoEventType.MESSAGE_RECEIVED, "RECEIVED: {}", logMessage);
+ logger.info("RECEIVED: {}", logMessage);
nextFilter.messageReceived(session, message);
}
Modified: mina/ftpserver/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/pom.xml?rev=725462&r1=725461&r2=725462&view=diff
==============================================================================
--- mina/ftpserver/trunk/pom.xml (original)
+++ mina/ftpserver/trunk/pom.xml Wed Dec 10 14:13:23 2008
@@ -150,8 +150,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <!-- When upgrading this, make sure to change the MINA version in osgi
tests -->
- <version>2.0.0-M3</version>
+ <version>2.0.0-M4</version>
<exclusions>
<exclusion>
<groupId>org.easymock</groupId>
