You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by mw...@apache.org on 2009/11/14 17:01:55 UTC

svn commit: r836198 - in /mina/sandbox/mwebb/mina: ./ src/main/java/org/apache/mina/example/xml/ src/main/java/org/apache/mina/example/xml/codec/ src/main/java/org/apache/mina/example/xml/parser/ src/main/java/org/apache/mina/util/app/ src/test/java/or...

Author: mwebb
Date: Sat Nov 14 16:01:54 2009
New Revision: 836198

URL: http://svn.apache.org/viewvc?rev=836198&view=rev
Log:
Updated code to 2.0 RC2

Modified:
    mina/sandbox/mwebb/mina/pom.xml
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Client.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ClientSessionHandler.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Server.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ServerSessionHandler.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageDecoder.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageEncoder.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageDecoder.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageEncoder.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageDecoder.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageEncoder.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ClientParser.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParser.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParserHandler.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParser.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParserHandler.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ServerParser.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/AbstractMinaApplication.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplication.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplicationFactory.java
    mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaServer.java
    mina/sandbox/mwebb/mina/src/test/java/org/apache/mina/util/app/Tester.java

Modified: mina/sandbox/mwebb/mina/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/pom.xml?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/pom.xml (original)
+++ mina/sandbox/mwebb/mina/pom.xml Sat Nov 14 16:01:54 2009
@@ -74,7 +74,7 @@
 		<dependency>
 			<groupId>org.apache.mina</groupId>
 			<artifactId>mina-core</artifactId>
-			<version>2.0.0-M1-SNAPSHOT</version>
+			<version>2.0.0-RC2-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Client.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Client.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Client.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Client.java Sat Nov 14 16:01:54 2009
@@ -20,8 +20,8 @@
 
 import java.net.InetSocketAddress;
 
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.service.IoConnector;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
 
 /**

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ClientSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ClientSessionHandler.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ClientSessionHandler.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ClientSessionHandler.java Sat Nov 14 16:01:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.mina.example.xml;
 
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.codec.XMLProtocolCodecFactory;
 import org.apache.mina.example.xml.message.ClientMessage;
 import org.apache.mina.example.xml.message.ServerMessage;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Server.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Server.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Server.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/Server.java Sat Nov 14 16:01:54 2009
@@ -20,7 +20,7 @@
 
 import java.net.InetSocketAddress;
 
-import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.core.service.IoAcceptor;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 
 /**

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ServerSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ServerSessionHandler.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ServerSessionHandler.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/ServerSessionHandler.java Sat Nov 14 16:01:54 2009
@@ -24,9 +24,9 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.codec.XMLProtocolCodecFactory;
 import org.apache.mina.example.xml.message.ClientMessage;
 import org.apache.mina.example.xml.message.ServerMessage;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageDecoder.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageDecoder.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageDecoder.java Sat Nov 14 16:01:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.mina.example.xml.codec;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.message.AbstractMessage;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
 import org.apache.mina.filter.codec.demux.MessageDecoder;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageEncoder.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageEncoder.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/AbstractMessageEncoder.java Sat Nov 14 16:01:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.mina.example.xml.codec;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.message.AbstractMessage;
 import org.apache.mina.filter.codec.ProtocolEncoderOutput;
 import org.apache.mina.filter.codec.demux.MessageEncoder;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageDecoder.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageDecoder.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageDecoder.java Sat Nov 14 16:01:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.mina.example.xml.codec;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.message.AbstractMessage;
 import org.apache.mina.example.xml.message.ClientMessage;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageEncoder.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageEncoder.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ClientMessageEncoder.java Sat Nov 14 16:01:54 2009
@@ -22,8 +22,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.message.AbstractMessage;
 import org.apache.mina.example.xml.message.ClientMessage;
 import org.apache.mina.filter.codec.demux.MessageEncoder;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageDecoder.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageDecoder.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageDecoder.java Sat Nov 14 16:01:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.mina.example.xml.codec;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.message.AbstractMessage;
 import org.apache.mina.example.xml.message.ServerMessage;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageEncoder.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageEncoder.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/codec/ServerMessageEncoder.java Sat Nov 14 16:01:54 2009
@@ -22,8 +22,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.message.AbstractMessage;
 import org.apache.mina.example.xml.message.ServerMessage;
 import org.apache.mina.filter.codec.demux.MessageEncoder;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ClientParser.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ClientParser.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ClientParser.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ClientParser.java Sat Nov 14 16:01:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.mina.example.xml.parser;
 
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.ClientSessionHandler;
 
 /**

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParser.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParser.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParser.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParser.java Sat Nov 14 16:01:54 2009
@@ -25,7 +25,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.ClientSessionHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParserHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParserHandler.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParserHandler.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageClientXMLParserHandler.java Sat Nov 14 16:01:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.mina.example.xml.parser;
 
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.ClientSessionHandler;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParser.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParser.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParser.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParser.java Sat Nov 14 16:01:54 2009
@@ -25,7 +25,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.ServerSessionHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParserHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParserHandler.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParserHandler.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/MessageServerXMLParserHandler.java Sat Nov 14 16:01:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.mina.example.xml.parser;
 
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.ServerSessionHandler;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ServerParser.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ServerParser.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ServerParser.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/example/xml/parser/ServerParser.java Sat Nov 14 16:01:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.mina.example.xml.parser;
 
-import org.apache.mina.common.IoSession;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.example.xml.ServerSessionHandler;
 
 /**

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/AbstractMinaApplication.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/AbstractMinaApplication.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/AbstractMinaApplication.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/AbstractMinaApplication.java Sat Nov 14 16:01:54 2009
@@ -20,7 +20,7 @@
 
 package org.apache.mina.util.app;
 
-import org.apache.mina.common.IoHandlerAdapter;
+import org.apache.mina.core.service.IoHandlerAdapter;
 
 /**
  * TODO AbstractMinaApplication.

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplication.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplication.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplication.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplication.java Sat Nov 14 16:01:54 2009
@@ -20,8 +20,8 @@
 
 package org.apache.mina.util.app;
 
-import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoHandlerAdapter;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.service.IoHandlerAdapter;
 
 /**
  * TODO MinaServer.

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplicationFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplicationFactory.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplicationFactory.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaApplicationFactory.java Sat Nov 14 16:01:54 2009
@@ -20,10 +20,9 @@
 
 package org.apache.mina.util.app;
 
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
 
@@ -92,37 +91,30 @@
 
             public void exceptionCaught( IoSession session, Throwable cause ) throws Exception
             {
-                IoSessionLogger.getLogger( session ).info( cause );
             }
 
             public void messageReceived( IoSession session, Object message ) throws Exception
             {
-                IoSessionLogger.getLogger( session ).info( "Message Received" );
             }
 
             public void messageSent( IoSession session, Object message ) throws Exception
             {
-                IoSessionLogger.getLogger( session ).info( "Message Sent" );
             }
 
             public void sessionClosed( IoSession session ) throws Exception
             {
-                IoSessionLogger.getLogger( session ).info( "Session Closed" );
             }
 
             public void sessionCreated( IoSession session ) throws Exception
             {
-                IoSessionLogger.getLogger( session ).info( "Session Created" );
             }
 
             public void sessionIdle( IoSession session, IdleStatus status ) throws Exception
             {
-                IoSessionLogger.getLogger( session ).info( "Session Idle" );
             }
 
             public void sessionOpened( IoSession session ) throws Exception
             {
-                IoSessionLogger.getLogger( session ).info( "Session Opened" );
             }
         }, AbstractMinaApplication.TCP);
         

Modified: mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaServer.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaServer.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaServer.java (original)
+++ mina/sandbox/mwebb/mina/src/main/java/org/apache/mina/util/app/MinaServer.java Sat Nov 14 16:01:54 2009
@@ -22,9 +22,9 @@
 
 import java.net.InetSocketAddress;
 
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoHandlerAdapter;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.filter.logging.LoggingFilter;
 import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
@@ -58,7 +58,7 @@
                 throw new IllegalArgumentException("Invalid NetworkProtocol type");
         }
         
-        acceptor.setLocalAddress( new InetSocketAddress(getPort()) );
+        acceptor.setDefaultLocalAddress( new InetSocketAddress(getPort()) );
         acceptor.setHandler( getHandler() );
     }
     

Modified: mina/sandbox/mwebb/mina/src/test/java/org/apache/mina/util/app/Tester.java
URL: http://svn.apache.org/viewvc/mina/sandbox/mwebb/mina/src/test/java/org/apache/mina/util/app/Tester.java?rev=836198&r1=836197&r2=836198&view=diff
==============================================================================
--- mina/sandbox/mwebb/mina/src/test/java/org/apache/mina/util/app/Tester.java (original)
+++ mina/sandbox/mwebb/mina/src/test/java/org/apache/mina/util/app/Tester.java Sat Nov 14 16:01:54 2009
@@ -1,7 +1,7 @@
 
 package org.apache.mina.util.app;
 
-import org.apache.mina.common.IoHandlerAdapter;
+import org.apache.mina.core.service.IoHandlerAdapter;
 
 public class Tester
 {