Author: trustin
Date: Tue Dec 7 22:11:20 2004
New Revision: 111225
URL: http://svn.apache.org/viewcvs?view=rev&rev=111225
Log:
* Renamed downstream package to core
* Renamed upstream package to protocol
* Merged common classed to core package (except utility classes)
* Renamed impl.tcp package into socket to follow the change of TransportType
Added:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Acceptor.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Acceptor.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Connector.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Connector.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/IdleStatus.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IdleStatus.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/IntraVmAddress.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IntraVmAddress.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/ReadBuffer.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/ReadBuffer.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Session.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Session.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionConfig.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/SessionConfig.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionHandler.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/SessionHandler.java
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/WriteBuffer.java
- copied, changed from r111216,
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/WriteBuffer.java
Removed:
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/
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/
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/upstream/
Modified:
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
Deleted:
/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=auto&rev=111224
==============================================================================
Deleted:
/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=auto&rev=111224
==============================================================================
Deleted:
/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=auto&rev=111224
==============================================================================
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Acceptor.java
(from r111216,
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/core/Acceptor.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Acceptor.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Acceptor.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Acceptor.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Acceptor.java
Tue Dec 7 22:11:20 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.downstream;
+package org.apache.mina.core;
import java.io.IOException;
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Connector.java
(from r111216,
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/core/Connector.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Connector.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Connector.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Connector.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Connector.java
Tue Dec 7 22:11:20 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.downstream;
+package org.apache.mina.core;
import java.io.IOException;
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/IdleStatus.java
(from r111216,
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/core/IdleStatus.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IdleStatus.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/IdleStatus.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IdleStatus.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/IdleStatus.java
Tue Dec 7 22:11:20 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.common;
+package org.apache.mina.core;
/**
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/IntraVmAddress.java
(from r111216,
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/core/IntraVmAddress.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IntraVmAddress.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/IntraVmAddress.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/IntraVmAddress.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/IntraVmAddress.java
Tue Dec 7 22:11:20 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.common;
+package org.apache.mina.core;
import java.net.SocketAddress;
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/ReadBuffer.java
(from r111216,
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/core/ReadBuffer.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/ReadBuffer.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/ReadBuffer.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/ReadBuffer.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/ReadBuffer.java
Tue Dec 7 22:11:20 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.downstream;
+package org.apache.mina.core;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Session.java
(from r111216,
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/core/Session.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Session.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Session.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/Session.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Session.java
Tue Dec 7 22:11:20 2004
@@ -17,12 +17,10 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.downstream;
+package org.apache.mina.core;
import java.net.SocketAddress;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.SessionConfig;
/**
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionConfig.java
(from r111216,
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/core/SessionConfig.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/SessionConfig.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionConfig.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/common/SessionConfig.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionConfig.java
Tue Dec 7 22:11:20 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.common;
+package org.apache.mina.core;
/**
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionHandler.java
(from r111216,
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/core/SessionHandler.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/SessionHandler.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionHandler.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/SessionHandler.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionHandler.java
Tue Dec 7 22:11:20 2004
@@ -17,9 +17,8 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.downstream;
+package org.apache.mina.core;
-import org.apache.mina.common.IdleStatus;
/**
Copied:
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/WriteBuffer.java
(from r111216,
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/core/WriteBuffer.java?view=diff&rev=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/WriteBuffer.java&r1=111216&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/WriteBuffer.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/downstream/WriteBuffer.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/WriteBuffer.java
Tue Dec 7 22:11:20 2004
@@ -17,7 +17,7 @@
/*
* @(#) $Id$
*/
-package org.apache.mina.downstream;
+package org.apache.mina.core;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Deleted:
/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=auto&rev=111224
==============================================================================
Deleted:
/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=auto&rev=111224
==============================================================================
Deleted:
/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=auto&rev=111224
==============================================================================
Deleted:
/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=auto&rev=111224
==============================================================================
Deleted:
/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=auto&rev=111224
==============================================================================
Deleted:
/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=auto&rev=111224
==============================================================================
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=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java&r1=111224&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/Service.java
Tue Dec 7 22:11:20 2004
@@ -19,7 +19,7 @@
*/
package org.apache.mina.registry;
-import org.apache.mina.downstream.SessionHandler;
+import org.apache.mina.core.SessionHandler;
/**
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=111225&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java&r1=111224&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java&r2=111225
==============================================================================
---
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java
(original)
+++
incubator/directory/seda/branches/trustin/src/java/org/apache/mina/registry/ServiceRegistry.java
Tue Dec 7 22:11:20 2004
@@ -22,7 +22,7 @@
import java.io.IOException;
import java.util.Iterator;
-import org.apache.mina.downstream.SessionHandler;
+import org.apache.mina.core.SessionHandler;
/**
