Switched to MINA 2.0.0-M4. Fixed some compilation issues
git-svn-id: https://svn.apache.org/repos/asf/mina/asyncweb/trunk@749672 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/client/src/test/java/org/apache/ahc/FakeIoSession.java b/client/src/test/java/org/apache/ahc/FakeIoSession.java
index 452e4fd..343344d 100644
--- a/client/src/test/java/org/apache/ahc/FakeIoSession.java
+++ b/client/src/test/java/org/apache/ahc/FakeIoSession.java
@@ -38,9 +38,9 @@
import org.apache.mina.core.service.TransportMetadata;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.session.TrafficMask;
import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestQueue;
import org.apache.mina.transport.socket.SocketSessionConfig;
public class FakeIoSession implements IoSession {
@@ -234,13 +234,6 @@
public void setWriteTimeout(int i) {
}
- public TrafficMask getTrafficMask() {
- return null;
- }
-
- public void setTrafficMask(TrafficMask trafficMask) {
- }
-
public void suspendRead() {
}
@@ -373,4 +366,21 @@
return false;
}
+ public boolean isWriteSuspended() {
+ return false;
+ }
+
+ public void updateThroughput( long currentTime, boolean force ) {
+ }
+
+ public void setCurrentWriteRequest( WriteRequest currentWriteRequest ) {
+ }
+
+ public WriteRequestQueue getWriteRequestQueue() {
+ return null;
+ }
+
+ public boolean isReadSuspended() {
+ return false;
+ }
}
diff --git a/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java b/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java
index 93eb72b..ec63a53 100644
--- a/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java
+++ b/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java
@@ -20,6 +20,8 @@
package org.apache.ahc;
+import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
public class FakeProtocolDecoderOutput implements ProtocolDecoderOutput {
@@ -38,4 +40,6 @@
return object;
}
+ public void flush( NextFilter nextFilter, IoSession session ) {
+ }
}
diff --git a/pom.xml b/pom.xml
index 29fac81..2b520af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.0-M3</version>
+ <version>2.0.0-M4</version>
</dependency>
<dependency>
diff --git a/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java b/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
index 81de588..ee41aea 100644
--- a/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
+++ b/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
@@ -203,16 +203,14 @@
{
LOG.debug( "Configuring traffic logging filter" );
LoggingFilter filter = new LoggingFilter();
- filter.setLogLevel( IoEventType.CLOSE, logLevel );
- filter.setLogLevel( IoEventType.EXCEPTION_CAUGHT, logLevel );
- filter.setLogLevel( IoEventType.MESSAGE_RECEIVED, logLevel );
- filter.setLogLevel( IoEventType.MESSAGE_SENT, logLevel );
- filter.setLogLevel( IoEventType.SESSION_CLOSED, logLevel );
- filter.setLogLevel( IoEventType.SESSION_CREATED, logLevel );
- filter.setLogLevel( IoEventType.SESSION_IDLE, logLevel );
- filter.setLogLevel( IoEventType.SESSION_OPENED, logLevel );
- filter.setLogLevel( IoEventType.SET_TRAFFIC_MASK, logLevel );
- filter.setLogLevel( IoEventType.WRITE, logLevel );
+ filter.setSessionClosedLoglevel( logLevel );
+ filter.setExceptionCaughtLoglevel( logLevel );
+ filter.setMessageReceivedLoglevel( logLevel );
+ filter.setMessageSentLoglevel( logLevel );
+ filter.setSessionClosedLoglevel( logLevel );
+ filter.setSessionCreatedLoglevel( logLevel );
+ filter.setSessionIdleLoglevel( logLevel );
+ filter.setSessionOpenedLoglevel( logLevel );
acceptor.getFilterChain().addLast( "logging", filter );
}
