summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-12-23 12:08:22 (EST)
committerEike Stepper2006-12-23 12:08:22 (EST)
commitaa4f6009cfea380f34ed462323f7fcf796090ed8 (patch)
tree8bb440a9a9726148291688dea6bebf40eb260ac8
parent01c999b937b030fc5b405f204881f45a4dc597f1 (diff)
downloadcdo-aa4f6009cfea380f34ed462323f7fcf796090ed8.zip
cdo-aa4f6009cfea380f34ed462323f7fcf796090ed8.tar.gz
cdo-aa4f6009cfea380f34ed462323f7fcf796090ed8.tar.bz2
Moved streaming API
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java4
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/.package.html47
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html45
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelOutputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/package.html (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/package.html)0
16 files changed, 112 insertions, 20 deletions
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
index 426ed62..2f2cb12 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
@@ -10,6 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.tests;
+import org.eclipse.net4j.stream.ChannelInputStream;
+import org.eclipse.net4j.stream.ChannelOutputStream;
import org.eclipse.net4j.transport.Buffer;
import org.eclipse.net4j.transport.BufferProvider;
import org.eclipse.net4j.transport.Channel;
@@ -18,8 +20,6 @@ import org.eclipse.net4j.transport.ProtocolFactory;
import org.eclipse.net4j.transport.tcp.TCPAcceptor;
import org.eclipse.net4j.transport.tcp.TCPAcceptorListener;
import org.eclipse.net4j.transport.tcp.TCPConnector;
-import org.eclipse.net4j.transport.util.ChannelInputStream;
-import org.eclipse.net4j.transport.util.ChannelOutputStream;
import org.eclipse.net4j.util.Net4jUtil;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.registry.HashMapRegistry;
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index c31d411..089033d 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -18,9 +18,9 @@ Export-Package: org.eclipse.internal.net4j.transport;version="0.8.0",
org.eclipse.net4j.message;version="0.8.0",
org.eclipse.net4j.remote;version="0.8.0",
org.eclipse.net4j.signal;version="0.8.0",
+ org.eclipse.net4j.stream;version="0.8.0",
org.eclipse.net4j.transport;version="0.8.0",
org.eclipse.net4j.transport.tcp;version="0.8.0",
- org.eclipse.net4j.transport.util;version="0.8.0",
org.eclipse.net4j.util;version="0.8.0",
org.eclipse.net4j.util.concurrent;version="0.8.0",
org.eclipse.net4j.util.lifecycle;version="0.8.0",
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/.package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/.package.html
new file mode 100644
index 0000000..ab7a22e
--- /dev/null
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/.package.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<title>Package Description</title>
+<!--
+
+ Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - Initial API and implementation
+
+-->
+</head>
+<body bgcolor="white">
+
+The main package of the Net4j API. Contains sub packages for the different layers
+of Net4j as well as a collection of {@link org.eclipse.net4j.util utility} packages and a
+{@link org.eclipse.net4j.util.Net4jUtil factory} class for the creation various
+instances of the transport layer interfaces.
+<p>
+
+<!--
+
+<h2>Package Specification</h2>
+
+##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
+<ul>
+ <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
+</ul>
+
+<h2>Related Documentation</h2>
+
+For overviews, tutorials, examples, guides, and tool documentation, please see:
+<ul>
+ <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
+</ul>
+
+-->
+
+<!-- Put @see and @since tags down here. -->
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html
new file mode 100644
index 0000000..9d1693d
--- /dev/null
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<title>Package Description</title>
+<!--
+
+ Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eike Stepper - Initial API and implementation
+
+-->
+</head>
+<body bgcolor="white">
+
+A framework for exporting and importing services on top of
+the Net4j transport layer.
+<p>
+
+<!--
+
+<h2>Package Specification</h2>
+
+##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
+<ul>
+ <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
+</ul>
+
+<h2>Related Documentation</h2>
+
+For overviews, tutorials, examples, guides, and tool documentation, please see:
+<ul>
+ <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
+</ul>
+
+-->
+
+<!-- Put @see and @since tags down here. -->
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
index 6b2b14c..e5d4fe7 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.signal;
-import org.eclipse.net4j.transport.util.BufferInputStream;
-import org.eclipse.net4j.transport.util.BufferOutputStream;
+import org.eclipse.net4j.stream.BufferInputStream;
+import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
index 3d1ddfe..90e65bf 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.signal;
-import org.eclipse.net4j.transport.util.BufferInputStream;
-import org.eclipse.net4j.transport.util.BufferOutputStream;
+import org.eclipse.net4j.stream.BufferInputStream;
+import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java
index dc26241..c3d7a76 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java
@@ -10,9 +10,9 @@
**************************************************************************/
package org.eclipse.net4j.signal;
+import org.eclipse.net4j.stream.BufferInputStream;
+import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.transport.util.BufferInputStream;
-import org.eclipse.net4j.transport.util.BufferOutputStream;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java
index 479b572..a9bab9d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java
@@ -10,9 +10,9 @@
**************************************************************************/
package org.eclipse.net4j.signal;
+import org.eclipse.net4j.stream.BufferInputStream;
+import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.transport.util.BufferInputStream;
-import org.eclipse.net4j.transport.util.BufferOutputStream;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
index c8c0e79..d00af91 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.signal;
-import org.eclipse.net4j.transport.util.BufferInputStream;
-import org.eclipse.net4j.transport.util.BufferOutputStream;
+import org.eclipse.net4j.stream.BufferInputStream;
+import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.Net4j;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
index 10ee350..62d1b5d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
@@ -10,9 +10,9 @@
**************************************************************************/
package org.eclipse.net4j.signal;
+import org.eclipse.net4j.stream.BufferInputStream;
import org.eclipse.net4j.transport.BufferHandler;
import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.transport.util.BufferInputStream;
import org.eclipse.net4j.util.ReflectUtil;
/**
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
index 11c84a3..d4700f5 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.net4j.signal;
+import org.eclipse.net4j.stream.BufferInputStream;
+import org.eclipse.net4j.stream.ChannelOutputStream;
import org.eclipse.net4j.transport.Buffer;
import org.eclipse.net4j.transport.BufferProvider;
import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.transport.util.BufferInputStream;
-import org.eclipse.net4j.transport.util.ChannelOutputStream;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.Net4j;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java
index 9bb94d2..d8b1623 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.transport.util;
+package org.eclipse.net4j.stream;
import org.eclipse.net4j.transport.Buffer;
import org.eclipse.net4j.transport.BufferHandler;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java
index c7f0ce4..77da26a 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.transport.util;
+package org.eclipse.net4j.stream;
import org.eclipse.net4j.transport.Buffer;
import org.eclipse.net4j.transport.BufferHandler;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java
index b0b491f..906bc65 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.transport.util;
+package org.eclipse.net4j.stream;
import org.eclipse.net4j.transport.Channel;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java
index 785a10c..04d9e60 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelOutputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.transport.util;
+package org.eclipse.net4j.stream;
import org.eclipse.net4j.transport.BufferProvider;
import org.eclipse.net4j.transport.Channel;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/package.html
index 30a3863..30a3863 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/package.html
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/package.html