Author: trustin
Date: Tue Aug 14 06:50:29 2007
New Revision: 565757
URL: http://svn.apache.org/viewvc?view=rev&rev=565757
Log:
* Moved classes in transport.vmpipe.support to transport.vmpipe
* Made IoSessionConfig implementations package-private
Added:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipe.java
- copied, changed from r565740,
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
- copied, changed from r565740,
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java
- copied, changed from r565740,
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java?view=diff&rev=565757&r1=565756&r2=565757
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java
Tue Aug 14 06:50:29 2007
@@ -31,7 +31,7 @@
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev: 439913 $, $Date: 2006-09-04 05:12:43 +0200 (mån, 04 sep
2006) $
*/
-public class DefaultDatagramSessionConfig extends AbstractIoSessionConfig
implements
+class DefaultDatagramSessionConfig extends AbstractIoSessionConfig implements
DatagramSessionConfig {
private static boolean SET_RECEIVE_BUFFER_SIZE_AVAILABLE = false;
@@ -127,7 +127,7 @@
/**
* Creates a new instance.
*/
- public DefaultDatagramSessionConfig() {
+ DefaultDatagramSessionConfig() {
}
/**
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java?view=diff&rev=565757&r1=565756&r2=565757
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java
Tue Aug 14 06:50:29 2007
@@ -39,7 +39,7 @@
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class DefaultSocketSessionConfig extends AbstractIoSessionConfig
implements
+class DefaultSocketSessionConfig extends AbstractIoSessionConfig implements
SocketSessionConfig {
private static Map<InetSocketAddress, InetAddress> TEST_ADDRESSES = new
LinkedHashMap<InetSocketAddress, InetAddress>();
@@ -237,7 +237,7 @@
/**
* Creates a new instance.
*/
- public DefaultSocketSessionConfig() {
+ DefaultSocketSessionConfig() {
}
public boolean isReuseAddress() {
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java?view=diff&rev=565757&r1=565756&r2=565757
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java
Tue Aug 14 06:50:29 2007
@@ -27,6 +27,8 @@
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class DefaultVmPipeSessionConfig extends AbstractIoSessionConfig
implements
+class DefaultVmPipeSessionConfig extends AbstractIoSessionConfig implements
VmPipeSessionConfig {
+ DefaultVmPipeSessionConfig() {
+ }
}
Copied:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipe.java
(from r565740,
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipe.java?view=diff&rev=565757&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java&r1=565740&p2=mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipe.java&r2=565757
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipe.java
Tue Aug 14 06:50:29 2007
@@ -17,18 +17,16 @@
* under the License.
*
*/
-package org.apache.mina.transport.vmpipe.support;
+package org.apache.mina.transport.vmpipe;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoServiceListenerSupport;
-import org.apache.mina.transport.vmpipe.VmPipeAcceptor;
-import org.apache.mina.transport.vmpipe.VmPipeAddress;
/**
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class VmPipe {
+class VmPipe {
private final VmPipeAcceptor acceptor;
private final VmPipeAddress address;
@@ -37,7 +35,7 @@
private final IoServiceListenerSupport listeners;
- public VmPipe(VmPipeAcceptor acceptor, VmPipeAddress address,
+ VmPipe(VmPipeAcceptor acceptor, VmPipeAddress address,
IoHandler handler, IoServiceListenerSupport listeners) {
this.acceptor = acceptor;
this.address = address;
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?view=diff&rev=565757&r1=565756&r2=565757
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
Tue Aug 14 06:50:29 2007
@@ -28,7 +28,6 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoServiceMetadata;
-import org.apache.mina.transport.vmpipe.support.VmPipe;
/**
* Binds the specified [EMAIL PROTECTED] IoHandler} to the specified
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?view=diff&rev=565757&r1=565756&r2=565757
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
Tue Aug 14 06:50:29 2007
@@ -35,9 +35,6 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IdleStatusChecker;
import org.apache.mina.common.IoServiceMetadata;
-import org.apache.mina.transport.vmpipe.support.VmPipe;
-import org.apache.mina.transport.vmpipe.support.VmPipeFilterChain;
-import org.apache.mina.transport.vmpipe.support.VmPipeSessionImpl;
/**
* Connects to [EMAIL PROTECTED] IoHandler}s which is bound on the specified
Copied:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
(from r565740,
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java?view=diff&rev=565757&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java&r1=565740&p2=mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java&r2=565757
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
Tue Aug 14 06:50:29 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.vmpipe.support;
+package org.apache.mina.transport.vmpipe;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -32,13 +32,13 @@
* @author The Apache Directory Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class VmPipeFilterChain extends AbstractIoFilterChain {
+class VmPipeFilterChain extends AbstractIoFilterChain {
private final Queue<Event> eventQueue = new ConcurrentLinkedQueue<Event>();
private boolean flushEnabled;
- public VmPipeFilterChain(IoSession session) {
+ VmPipeFilterChain(IoSession session) {
super(session);
}
Copied:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java
(from r565740,
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java?view=diff&rev=565757&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java&r1=565740&p2=mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java&r2=565757
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java
Tue Aug 14 06:50:29 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.vmpipe.support;
+package org.apache.mina.transport.vmpipe;
import java.util.ArrayList;
import java.util.List;
@@ -31,10 +31,6 @@
import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.transport.vmpipe.DefaultVmPipeSessionConfig;
-import org.apache.mina.transport.vmpipe.VmPipeAddress;
-import org.apache.mina.transport.vmpipe.VmPipeSession;
-import org.apache.mina.transport.vmpipe.VmPipeSessionConfig;
/**
* A [EMAIL PROTECTED] IoSession} for in-VM transport (VM_PIPE).
@@ -42,7 +38,7 @@
* @author The Apache Directory Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class VmPipeSessionImpl extends AbstractIoSession implements
VmPipeSession {
+class VmPipeSessionImpl extends AbstractIoSession implements VmPipeSession {
private static final VmPipeSessionConfig CONFIG = new
DefaultVmPipeSessionConfig();
private final IoService service;
@@ -68,7 +64,7 @@
/**
* Constructor for client-side session.
*/
- public VmPipeSessionImpl(IoService service,
+ VmPipeSessionImpl(IoService service,
IoServiceListenerSupport serviceListeners,
VmPipeAddress localAddress, IoHandler handler, VmPipe remoteEntry)
{
this.service = service;