Author: trustin
Date: Tue Dec 7 21:46:34 2004
New Revision: 111216
URL: http://svn.apache.org/viewcvs?view=rev&rev=111216
Log:
* Renamed Netty to MINA (Multipurpose Infrastructure for Network Applications)
* Catching up recent dependency changes
* Modified POM according MINA index.xml xdoc.
Added:
incubator/directory/seda/branches/trustin/src/examples/org/apache/mina/
- copied from r111211,
incubator/directory/seda/branches/trustin/src/examples/org/apache/netty/
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/
- copied from r111211,
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/
Removed:
incubator/directory/seda/branches/trustin/src/examples/org/apache/netty/
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/
Modified:
incubator/directory/seda/branches/trustin/project.properties
incubator/directory/seda/branches/trustin/project.xml
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IdleStatus.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IntraVmAddress.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/SessionConfig.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/BasicSessionConfig.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBufferPool.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBuffers.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/Queue.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Acceptor.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Connector.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/ReadBuffer.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Session.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/SessionHandler.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/WriteBuffer.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpAcceptor.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpConnector.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpIoProcessor.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpReadBuffer.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSession.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSessionConfig.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpWriteBuffer.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/TransportType.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Acceptor.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Codec.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Connector.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/MessageParseException.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Session.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/SessionHandler.java
incubator/directory/seda/branches/trustin/xdocs/index.xml
Modified: incubator/directory/seda/branches/trustin/project.properties
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/project.properties?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/project.properties&r1=111215&p2=incubator/directory/seda/branches/trustin/project.properties&r2=111216
==============================================================================
--- incubator/directory/seda/branches/trustin/project.properties
(original)
+++ incubator/directory/seda/branches/trustin/project.properties Tue Dec
7 21:46:34 2004
@@ -1,15 +1,15 @@
-maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-maven.xdoc.date=left
-maven.xdoc.includeProjectDocumentation=no
-maven.xdoc.poweredby.image=
-
-#
-# remote repository properties
-#
-
-maven.repo.remote=http://cvs.apache.org/repository, http://ibiblio.org/maven
-maven.repo.central=minotaur.apache.org
-maven.repo.central.directory=/www/cvs.apache.org/repository
-maven.remote.group=apcvs
-
-maven.compile.source = 1.3
\ No newline at end of file
+maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+maven.xdoc.date=left
+maven.xdoc.includeProjectDocumentation=no
+maven.xdoc.poweredby.image=
+
+#
+# remote repository properties
+#
+
+maven.repo.remote=http://cvs.apache.org/repository,
http://mirrors.sunsite.dk/maven/
+maven.repo.central=minotaur.apache.org
+maven.repo.central.directory=/www/cvs.apache.org/repository
+maven.remote.group=apcvs
+
+maven.compile.source = 1.3
Modified: incubator/directory/seda/branches/trustin/project.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/project.xml?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/project.xml&r1=111215&p2=incubator/directory/seda/branches/trustin/project.xml&r2=111216
==============================================================================
--- incubator/directory/seda/branches/trustin/project.xml (original)
+++ incubator/directory/seda/branches/trustin/project.xml Tue Dec 7
21:46:34 2004
@@ -2,9 +2,9 @@
<project>
<groupId>incubator-directory</groupId>
- <id>netty</id>
- <name>netty</name>
- <package>org.apache.netty</package>
+ <id>mina</id>
+ <name>MINA</name>
+ <package>org.apache.mina</package>
<currentVersion>SNAPSHOT</currentVersion>
<inceptionYear>2004</inceptionYear>
@@ -42,31 +42,17 @@
</developerConnection>
</repository>
- <description>
- The SEDA protocol server framework contains service interfaces and
- implementations for the various stages of a protocol server very much
- like inetd however in the same process. The framework can run multiple
- protocols on different socks within the same server.
- BETTER DESC TO FOLLOW.
- </description>
-
- <shortDescription>An internet protocol server framework</shortDescription>
+ <shortDescription>
+ A Multipurpose Infrastrusture for Network Applications
+ </shortDescription>
<description>
- The seda framework is designed for rapidly building internet protocol
- servers that can handle a high degree of concurrency. Users of the
- framework need not worry about low level IO details and plumbing. They
- can use this time to focus on their protocol of choice which ultimately
- snaps into the framework using a couple of interfaces. The same plumbing
- within this service oriented frontend can be used to drive multiple
- protocols. The framework is based on non-blocking IO using NIO selectors
- and channels: although these details are not exposed to the protocol
- developer. It has a simple intuitive Staged Event Driven Architecture
- that does not try to get overly theoretical while taking advantage of all
- the benefits SEDA has to offer for building reponsive servers under a high
- degree of load.
+ MINA (Multipurpose Infrastructure for Network Applications) is a high
+ performance and high scalability network application framework which
+ allows easy development of network applications.
</description>
+
<mailingLists>
<mailingList>
<name>Apache Directory Developement - use [seda] prefix</name>
@@ -112,12 +98,12 @@
<url>http://jakarta.apache.org/commons/logging</url>
</dependency>
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>codec-stateful</artifactId>
- <version>SNAPSHOT</version>
- <url>http://incubator.apache.org/directory/subprojects/ldap/common</url>
- </dependency>
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>snickers-codec</artifactId>
+ <version>0.2.0</version>
+ <url>http://incubator.apache.org/directory/subprojects/ldap/common</url>
+ </dependency>
<!-- ========================================================= -->
<!-- Dependencies required for running test cases and examples -->
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IdleStatus.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IdleStatus.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/IdleStatus.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IdleStatus.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/IdleStatus.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IdleStatus.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.common;
+package org.apache.mina.common;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IntraVmAddress.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IntraVmAddress.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/IntraVmAddress.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IntraVmAddress.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/IntraVmAddress.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IntraVmAddress.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.common;
+package org.apache.mina.common;
import java.net.SocketAddress;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/SessionConfig.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/SessionConfig.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/SessionConfig.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/SessionConfig.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/SessionConfig.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/SessionConfig.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.common;
+package org.apache.mina.common;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/BasicSessionConfig.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/BasicSessionConfig.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/util/BasicSessionConfig.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/BasicSessionConfig.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/util/BasicSessionConfig.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/BasicSessionConfig.java
Tue Dec 7 21:46:34 2004
@@ -17,10 +17,10 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.common.util;
+package org.apache.mina.common.util;
-import org.apache.netty.common.IdleStatus;
-import org.apache.netty.common.SessionConfig;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.SessionConfig;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBufferPool.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBufferPool.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/util/ByteBufferPool.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBufferPool.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/util/ByteBufferPool.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBufferPool.java
Tue Dec 7 21:46:34 2004
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.netty.common.util;
+package org.apache.mina.common.util;
import java.nio.ByteBuffer;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBuffers.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBuffers.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/util/ByteBuffers.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBuffers.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/util/ByteBuffers.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/ByteBuffers.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.common.util;
+package org.apache.mina.common.util;
import java.nio.ByteBuffer;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/Queue.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/Queue.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/util/Queue.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/Queue.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/common/util/Queue.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/util/Queue.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.common.util;
+package org.apache.mina.common.util;
import java.io.Serializable;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Acceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Acceptor.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/Acceptor.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Acceptor.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/Acceptor.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Acceptor.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream;
+package org.apache.mina.downstream;
import java.io.IOException;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Connector.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Connector.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/Connector.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Connector.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/Connector.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Connector.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream;
+package org.apache.mina.downstream;
import java.io.IOException;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/ReadBuffer.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/ReadBuffer.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/ReadBuffer.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/ReadBuffer.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/ReadBuffer.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/ReadBuffer.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream;
+package org.apache.mina.downstream;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Session.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Session.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/Session.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Session.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/Session.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Session.java
Tue Dec 7 21:46:34 2004
@@ -17,12 +17,12 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream;
+package org.apache.mina.downstream;
import java.net.SocketAddress;
-import org.apache.netty.common.IdleStatus;
-import org.apache.netty.common.SessionConfig;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.SessionConfig;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/SessionHandler.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/SessionHandler.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/SessionHandler.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/SessionHandler.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/SessionHandler.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/SessionHandler.java
Tue Dec 7 21:46:34 2004
@@ -17,9 +17,9 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream;
+package org.apache.mina.downstream;
-import org.apache.netty.common.IdleStatus;
+import org.apache.mina.common.IdleStatus;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/WriteBuffer.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/WriteBuffer.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/WriteBuffer.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/WriteBuffer.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/WriteBuffer.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/WriteBuffer.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream;
+package org.apache.mina.downstream;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpAcceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpAcceptor.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpAcceptor.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpAcceptor.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpAcceptor.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpAcceptor.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream.impl.tcp;
+package org.apache.mina.downstream.impl.tcp;
import java.io.IOException;
@@ -36,8 +36,8 @@
import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.netty.downstream.Acceptor;
-import org.apache.netty.downstream.SessionHandler;
+import org.apache.mina.downstream.Acceptor;
+import org.apache.mina.downstream.SessionHandler;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpConnector.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpConnector.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpConnector.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpConnector.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpConnector.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpConnector.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream.impl.tcp;
+package org.apache.mina.downstream.impl.tcp;
import java.io.IOException;
@@ -35,8 +35,8 @@
import org.apache.commons.lang.Validate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.netty.downstream.Connector;
-import org.apache.netty.downstream.SessionHandler;
+import org.apache.mina.downstream.Connector;
+import org.apache.mina.downstream.SessionHandler;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpIoProcessor.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpIoProcessor.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpIoProcessor.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpIoProcessor.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpIoProcessor.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpIoProcessor.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream.impl.tcp;
+package org.apache.mina.downstream.impl.tcp;
import java.io.IOException;
@@ -31,10 +31,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.netty.common.IdleStatus;
-import org.apache.netty.common.SessionConfig;
-import org.apache.netty.common.util.ByteBufferPool;
-import org.apache.netty.common.util.Queue;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.SessionConfig;
+import org.apache.mina.common.util.ByteBufferPool;
+import org.apache.mina.common.util.Queue;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpReadBuffer.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpReadBuffer.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpReadBuffer.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpReadBuffer.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpReadBuffer.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpReadBuffer.java
Tue Dec 7 21:46:34 2004
@@ -17,12 +17,12 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream.impl.tcp;
+package org.apache.mina.downstream.impl.tcp;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.netty.downstream.ReadBuffer;
+import org.apache.mina.downstream.ReadBuffer;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSession.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSession.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpSession.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSession.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpSession.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSession.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream.impl.tcp;
+package org.apache.mina.downstream.impl.tcp;
import java.net.SocketAddress;
@@ -26,13 +26,13 @@
import java.nio.channels.SocketChannel;
import org.apache.commons.lang.Validate;
-import org.apache.netty.common.IdleStatus;
-import org.apache.netty.common.SessionConfig;
-import org.apache.netty.common.util.ByteBufferPool;
-import org.apache.netty.downstream.ReadBuffer;
-import org.apache.netty.downstream.Session;
-import org.apache.netty.downstream.SessionHandler;
-import org.apache.netty.downstream.WriteBuffer;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.SessionConfig;
+import org.apache.mina.common.util.ByteBufferPool;
+import org.apache.mina.downstream.ReadBuffer;
+import org.apache.mina.downstream.Session;
+import org.apache.mina.downstream.SessionHandler;
+import org.apache.mina.downstream.WriteBuffer;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSessionConfig.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSessionConfig.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpSessionConfig.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSessionConfig.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpSessionConfig.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpSessionConfig.java
Tue Dec 7 21:46:34 2004
@@ -17,13 +17,13 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream.impl.tcp;
+package org.apache.mina.downstream.impl.tcp;
import java.net.SocketException;
import java.nio.channels.SocketChannel;
-import org.apache.netty.common.util.BasicSessionConfig;
+import org.apache.mina.common.util.BasicSessionConfig;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpWriteBuffer.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpWriteBuffer.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpWriteBuffer.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpWriteBuffer.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/downstream/impl/tcp/TcpWriteBuffer.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/impl/tcp/TcpWriteBuffer.java
Tue Dec 7 21:46:34 2004
@@ -17,13 +17,13 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.downstream.impl.tcp;
+package org.apache.mina.downstream.impl.tcp;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import org.apache.netty.downstream.ReadBuffer;
-import org.apache.netty.downstream.WriteBuffer;
+import org.apache.mina.downstream.ReadBuffer;
+import org.apache.mina.downstream.WriteBuffer;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/registry/Service.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/registry/Service.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.registry;
+package org.apache.mina.registry;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/registry/ServiceRegistry.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/registry/ServiceRegistry.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.registry;
+package org.apache.mina.registry;
import java.io.IOException;
@@ -34,11 +34,11 @@
*/
public interface ServiceRegistry {
void bind(Service service,
- org.apache.netty.downstream.SessionHandler sessionHandler)
+ org.apache.mina.downstream.SessionHandler sessionHandler)
throws IOException;
void bind(Service service,
- org.apache.netty.upstream.SessionHandler sessionHandler)
+ org.apache.mina.upstream.SessionHandler sessionHandler)
throws IOException;
void unbind(Service service);
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/TransportType.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/TransportType.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/registry/TransportType.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/TransportType.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/registry/TransportType.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/TransportType.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.registry;
+package org.apache.mina.registry;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Acceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Acceptor.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/Acceptor.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Acceptor.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/Acceptor.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Acceptor.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.upstream;
+package org.apache.mina.upstream;
import java.io.IOException;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Codec.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Codec.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/Codec.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Codec.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/Codec.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Codec.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.upstream;
+package org.apache.mina.upstream;
import java.nio.ByteBuffer;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Connector.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Connector.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/Connector.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Connector.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/Connector.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Connector.java
Tue Dec 7 21:46:34 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.upstream;
+package org.apache.mina.upstream;
import java.io.IOException;
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/MessageParseException.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/MessageParseException.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/MessageParseException.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/MessageParseException.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/MessageParseException.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/MessageParseException.java
Tue Dec 7 21:46:34 2004
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.netty.upstream;
+package org.apache.mina.upstream;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.commons.lang.Validate;
-import org.apache.netty.common.util.ByteBuffers;
+import org.apache.mina.common.util.ByteBuffers;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Session.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Session.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/Session.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Session.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/Session.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/Session.java
Tue Dec 7 21:46:34 2004
@@ -17,12 +17,12 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.upstream;
+package org.apache.mina.upstream;
import java.net.SocketAddress;
-import org.apache.netty.common.IdleStatus;
-import org.apache.netty.common.SessionConfig;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.SessionConfig;
/**
Modified:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/SessionHandler.java
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/SessionHandler.java?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/SessionHandler.java&r1=111211&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/SessionHandler.java&r2=111216
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/netty/upstream/SessionHandler.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/SessionHandler.java
Tue Dec 7 21:46:34 2004
@@ -17,9 +17,9 @@
/*
* @(#) $Id$
*/
-package org.apache.netty.upstream;
+package org.apache.mina.upstream;
-import org.apache.netty.common.IdleStatus;
+import org.apache.mina.common.IdleStatus;
/**
Modified: incubator/directory/seda/branches/trustin/xdocs/index.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/xdocs/index.xml?view=diff&rev=111216&p1=incubator/directory/seda/branches/trustin/xdocs/index.xml&r1=111215&p2=incubator/directory/seda/branches/trustin/xdocs/index.xml&r2=111216
==============================================================================
--- incubator/directory/seda/branches/trustin/xdocs/index.xml (original)
+++ incubator/directory/seda/branches/trustin/xdocs/index.xml Tue Dec 7
21:46:34 2004
@@ -8,13 +8,12 @@
<body>
<section name="Introduction">
<p>
- SEDA is a high performance and high scalability network application
- framework which follows
- <a href="http://www.eecs.harvard.edu/~mdw/proj/seda/";>Staged
- Event-Driven Architecture</a>.
+ MINA (Multipurpose Infrastructure for Network Applications) is a high
+ performance and high scalability network application framework which
+ allows easy development of network applications.
</p>
<p>
- SEDA will be a simple yet full-featured network application which
+ MINA will be a simple yet full-featured network application which
provides:
<ul>
<li>Support for TCP, UDP, and intra-VM transport types,</li>
