Author: elecharny Date: Tue Mar 3 17:59:26 2009 New Revision: 749672 URL: http://svn.apache.org/viewvc?rev=749672&view=rev Log: Switched to MINA 2.0.0-M4. Fixed some compilation issues
Modified: mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java mina/asyncweb/trunk/pom.xml mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java Modified: mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java?rev=749672&r1=749671&r2=749672&view=diff ============================================================================== --- mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java (original) +++ mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java Tue Mar 3 17:59:26 2009 @@ -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; + } } Modified: mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java?rev=749672&r1=749671&r2=749672&view=diff ============================================================================== --- mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java (original) +++ mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java Tue Mar 3 17:59:26 2009 @@ -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 ) { + } } Modified: mina/asyncweb/trunk/pom.xml URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/pom.xml?rev=749672&r1=749671&r2=749672&view=diff ============================================================================== --- mina/asyncweb/trunk/pom.xml (original) +++ mina/asyncweb/trunk/pom.xml Tue Mar 3 17:59:26 2009 @@ -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> Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java?rev=749672&r1=749671&r2=749672&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java Tue Mar 3 17:59:26 2009 @@ -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 ); }