Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-10-24 03:22:53 -0400
committerEike Stepper2006-10-24 03:22:53 -0400
commit93059a438c016694152ffe12e89817d99330c766 (patch)
treea8f0c0c6ddd15163f18ef5fbbe276d8969908493 /plugins/org.eclipse.net4j
parent27c10728257638ecc5d2613a1cce81fd770ecd94 (diff)
downloadcdo-93059a438c016694152ffe12e89817d99330c766.tar.gz
cdo-93059a438c016694152ffe12e89817d99330c766.tar.xz
cdo-93059a438c016694152ffe12e89817d99330c766.zip
Restructure to remove package cycles
Diffstat (limited to 'plugins/org.eclipse.net4j')
-rw-r--r--plugins/org.eclipse.net4j/.classpath2
-rw-r--r--plugins/org.eclipse.net4j/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF7
-rw-r--r--plugins/org.eclipse.net4j/build.properties3
-rw-r--r--plugins/org.eclipse.net4j/javadoc.xml2
-rw-r--r--plugins/org.eclipse.net4j/plugin.properties33
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Activator.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractCachingMap.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/map/AbstractCachingMap.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractDelegatingMap.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/map/AbstractDelegatingMap.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html46
-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/transport/util/BufferInputStream.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/BufferInputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/BufferOutputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ChannelInputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelOutputStream.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ChannelOutputStream.java)2
21 files changed, 110 insertions, 24 deletions
diff --git a/plugins/org.eclipse.net4j/.classpath b/plugins/org.eclipse.net4j/.classpath
index 8ea6ca0559..cb257754fe 100644
--- a/plugins/org.eclipse.net4j/.classpath
+++ b/plugins/org.eclipse.net4j/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/eclipse/internal/net4j/bundle/Activator.java|org/eclipse/internal/net4j/bundle/Log.java|org/eclipse/internal/net4j/component/InactiveException.java|org/eclipse/net4j/transport/ChannelMultiplexer.java" kind="src" path="src"/>
+ <classpathentry excluding="org/eclipse/internal/net4j/bundle/Log.java|org/eclipse/internal/net4j/component/InactiveException.java|org/eclipse/net4j/transport/ChannelMultiplexer.java" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.net4j/.cvsignore b/plugins/org.eclipse.net4j/.cvsignore
index ba077a4031..693869726d 100644
--- a/plugins/org.eclipse.net4j/.cvsignore
+++ b/plugins/org.eclipse.net4j/.cvsignore
@@ -1 +1,2 @@
bin
+doc
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index b7a94d08a1..58030c970a 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Net4j Plug-in
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j
Bundle-Version: 0.8.0.qualifier
Bundle-Localization: plugin
@@ -9,15 +9,18 @@ Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
Export-Package: org.eclipse.internal.net4j.transport;version="0.8.0",
org.eclipse.internal.net4j.transport.embedded;version="0.8.0",
org.eclipse.internal.net4j.transport.tcp;version="0.8.0",
+ org.eclipse.internal.net4j.util;version="0.8.0",
org.eclipse.net4j;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.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",
- org.eclipse.net4j.util.map;version="0.8.0",
org.eclipse.net4j.util.registry;version="0.8.0",
org.eclipse.net4j.util.stream;version="0.8.0"
+Bundle-Vendor: %providerName
+Bundle-Activator: org.eclipse.internal.net4j.bundle.Activator
diff --git a/plugins/org.eclipse.net4j/build.properties b/plugins/org.eclipse.net4j/build.properties
index 34d2e4d2da..aa1a008269 100644
--- a/plugins/org.eclipse.net4j/build.properties
+++ b/plugins/org.eclipse.net4j/build.properties
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ plugin.properties
diff --git a/plugins/org.eclipse.net4j/javadoc.xml b/plugins/org.eclipse.net4j/javadoc.xml
index 52a4c5049d..217a611f56 100644
--- a/plugins/org.eclipse.net4j/javadoc.xml
+++ b/plugins/org.eclipse.net4j/javadoc.xml
@@ -21,10 +21,12 @@
<package name="org.eclipse.net4j.signal"/>
<package name="org.eclipse.net4j.transport"/>
<package name="org.eclipse.net4j.transport.tcp"/>
+ <package name="org.eclipse.net4j.transport.util"/>
<package name="org.eclipse.net4j.util"/>
<package name="org.eclipse.net4j.util.concurrent"/>
<package name="org.eclipse.net4j.util.lifecycle"/>
<package name="org.eclipse.net4j.util.registry"/>
+ <package name="org.eclipse.net4j.util.stream"/>
<link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
</javadoc>
</target>
diff --git a/plugins/org.eclipse.net4j/plugin.properties b/plugins/org.eclipse.net4j/plugin.properties
new file mode 100644
index 0000000000..ad02e2ded7
--- /dev/null
+++ b/plugins/org.eclipse.net4j/plugin.properties
@@ -0,0 +1,33 @@
+# /**
+# * <copyright>
+# *
+# * 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
+# *
+# * </copyright>
+# *
+# * $Id$
+# */
+
+# NLS_MESSAGEFORMAT_VAR
+
+# ==============================================================================
+# Do not change the properties between this line and the last line containing:
+# %%% END OF TRANSLATED PROPERTIES %%%
+# Instead, either redefine an existing property, or create a new property,
+# append it to the end of the file, and change the code to use the new name.
+# ==============================================================================
+
+pluginName=Net4j
+providerName=Eclipse.org
+
+# ==============================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# The above properties have been shipped for translation.
+# ==============================================================================
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Activator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Activator.java
index fb5f2862f5..9b4150a4a2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Activator.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.internal.net4j.util.bundle;
+package org.eclipse.internal.net4j.bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/map/AbstractCachingMap.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractCachingMap.java
index 530298e41c..d3429ac7b5 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/map/AbstractCachingMap.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractCachingMap.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.map;
+package org.eclipse.internal.net4j.util;
import java.util.AbstractMap;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/map/AbstractDelegatingMap.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractDelegatingMap.java
index ab445ceb70..3b17776ca0 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/map/AbstractDelegatingMap.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/AbstractDelegatingMap.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.map;
+package org.eclipse.internal.net4j.util;
import java.util.Collection;
import java.util.Map;
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 0000000000..272d2a232e
--- /dev/null
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+
+ 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.Net4jFactory 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/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
index 4eb729a78d..9a162379b8 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.util.stream.BufferInputStream;
-import org.eclipse.net4j.util.stream.BufferOutputStream;
+import org.eclipse.net4j.transport.util.BufferInputStream;
+import org.eclipse.net4j.transport.util.BufferOutputStream;
import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
import java.io.IOException;
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 2ba29d2710..531c76fad2 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.util.stream.BufferInputStream;
-import org.eclipse.net4j.util.stream.BufferOutputStream;
+import org.eclipse.net4j.transport.util.BufferInputStream;
+import org.eclipse.net4j.transport.util.BufferOutputStream;
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 e56affa5cd..1c554359b5 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
@@ -11,8 +11,8 @@
package org.eclipse.net4j.signal;
import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.util.stream.BufferInputStream;
-import org.eclipse.net4j.util.stream.BufferOutputStream;
+import org.eclipse.net4j.transport.util.BufferInputStream;
+import org.eclipse.net4j.transport.util.BufferOutputStream;
import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
import java.io.IOException;
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 cbc9a6afea..7259fd8532 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
@@ -11,8 +11,8 @@
package org.eclipse.net4j.signal;
import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.util.stream.BufferInputStream;
-import org.eclipse.net4j.util.stream.BufferOutputStream;
+import org.eclipse.net4j.transport.util.BufferInputStream;
+import org.eclipse.net4j.transport.util.BufferOutputStream;
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 35f181b732..9a8d10cd8d 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.util.stream.BufferInputStream;
-import org.eclipse.net4j.util.stream.BufferOutputStream;
+import org.eclipse.net4j.transport.util.BufferInputStream;
+import org.eclipse.net4j.transport.util.BufferOutputStream;
/**
* @author Eike Stepper
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 b8dffa179c..8c08a87573 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
@@ -12,7 +12,7 @@ package org.eclipse.net4j.signal;
import org.eclipse.net4j.transport.BufferHandler;
import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.util.stream.BufferInputStream;
+import org.eclipse.net4j.transport.util.BufferInputStream;
/**
* @author Eike Stepper
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 74b359a38b..905f8cb7fb 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.signal;
import org.eclipse.net4j.transport.Buffer;
import org.eclipse.net4j.transport.BufferProvider;
import org.eclipse.net4j.transport.Channel;
-import org.eclipse.net4j.util.stream.BufferInputStream;
-import org.eclipse.net4j.util.stream.ChannelOutputStream;
+import org.eclipse.net4j.transport.util.BufferInputStream;
+import org.eclipse.net4j.transport.util.ChannelOutputStream;
import org.eclipse.internal.net4j.transport.AbstractProtocol;
import org.eclipse.internal.net4j.transport.BufferUtil;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/BufferInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java
index 06131b2f63..41f49f352b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/BufferInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferInputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.stream;
+package org.eclipse.net4j.transport.util;
import org.eclipse.net4j.transport.Buffer;
import org.eclipse.net4j.transport.BufferHandler;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/BufferOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java
index 92f4342845..e6ea3482ad 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/BufferOutputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/BufferOutputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.stream;
+package org.eclipse.net4j.transport.util;
import org.eclipse.net4j.transport.Buffer;
import org.eclipse.net4j.transport.BufferHandler;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ChannelInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java
index 81cfb487f8..5c6eacd587 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ChannelInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelInputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.stream;
+package org.eclipse.net4j.transport.util;
import org.eclipse.net4j.transport.Channel;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ChannelOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelOutputStream.java
index 2314836ffa..37ef3b79f3 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ChannelOutputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/util/ChannelOutputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.stream;
+package org.eclipse.net4j.transport.util;
import org.eclipse.net4j.transport.BufferProvider;
import org.eclipse.net4j.transport.Channel;

Back to the top