*** empty log message ***

6 files changed, 34 insertions, 32 deletions

diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
index 4a6512ea40..c8c7ee2572 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
@@ -10,17 +10,17 @@
  **************************************************************************/
 package org.eclipse.net4j.tests;
 
+import org.eclipse.net4j.Net4jUtil;
 import org.eclipse.net4j.internal.tcp.TCPAcceptorFactory;
 import org.eclipse.net4j.internal.tcp.TCPConnectorFactory;
-import org.eclipse.net4j.internal.tcp.TCPSelectorFactory;
-import org.eclipse.net4j.internal.tcp.TCPSelectorInjector;
-import org.eclipse.net4j.tcp.ITCPConstants;
+import org.eclipse.net4j.internal.util.container.ManagedContainer;
+import org.eclipse.net4j.tcp.TCPUtil;
+import org.eclipse.net4j.util.container.IManagedContainer;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
 import org.eclipse.net4j.util.tests.AbstractOMTest;
 
 import org.eclipse.internal.net4j.Acceptor;
 import org.eclipse.internal.net4j.Connector;
-import org.eclipse.internal.net4j.TransportContainer;
 
 /**
  * @author Eike Stepper
@@ -29,7 +29,7 @@ public abstract class AbstractTransportTest extends AbstractOMTest
 {
   protected static final String HOST = "localhost";
 
-  protected TransportContainer container;
+  protected IManagedContainer container;
 
   private Acceptor acceptor;
 
@@ -60,13 +60,11 @@ public abstract class AbstractTransportTest extends AbstractOMTest
     }
   }
 
-  protected TransportContainer createContainer()
+  protected IManagedContainer createContainer()
   {
-    TransportContainer container = new TransportContainer();
-    container.registerFactory(new TCPSelectorFactory());
-    container.registerFactory(new TCPAcceptorFactory());
-    container.registerFactory(new TCPConnectorFactory());
-    container.addPostProcessor(new TCPSelectorInjector());
+    IManagedContainer container = new ManagedContainer();
+    Net4jUtil.prepareContainer(container);
+    TCPUtil.prepareContainer(container);
     return container;
   }
 
@@ -74,7 +72,7 @@ public abstract class AbstractTransportTest extends AbstractOMTest
   {
     if (acceptor == null)
     {
-      acceptor = container.getAcceptor(ITCPConstants.TYPE, null);
+      acceptor = TCPAcceptorFactory.get(container, null);
     }
 
     return acceptor;
@@ -84,7 +82,7 @@ public abstract class AbstractTransportTest extends AbstractOMTest
   {
     if (connector == null)
     {
-      connector = container.getConnector(ITCPConstants.TYPE, HOST);
+      connector = TCPConnectorFactory.get(container, HOST);
     }
 
     return connector;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java
index 8d29c501ca..ddc0840a64 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java
@@ -15,8 +15,7 @@ import org.eclipse.net4j.tests.signal.Request1;
 import org.eclipse.net4j.tests.signal.Request2;
 import org.eclipse.net4j.tests.signal.TestSignalProtocol;
 import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory;
-
-import org.eclipse.internal.net4j.TransportContainer;
+import org.eclipse.net4j.util.container.IManagedContainer;
 
 import java.util.Arrays;
 
@@ -26,9 +25,9 @@ import java.util.Arrays;
 public class SignalTest extends AbstractTransportTest
 {
   @Override
-  protected TransportContainer createContainer()
+  protected IManagedContainer createContainer()
   {
-    TransportContainer container = super.createContainer();
+    IManagedContainer container = super.createContainer();
     container.registerFactory(new TestSignalServerProtocolFactory());
     return container;
   }
@@ -36,7 +35,7 @@ public class SignalTest extends AbstractTransportTest
   public void testInteger() throws Exception
   {
     startTransport();
-    IChannel channel = getConnector().openChannel(TestSignalProtocol.TYPE);
+    IChannel channel = getConnector().openChannel(TestSignalProtocol.PROTOCOL_NAME);
     int data = 0x0a;
     int result = new Request1(channel, data).send();
     assertEquals(data, result);
@@ -45,7 +44,7 @@ public class SignalTest extends AbstractTransportTest
   public void testArray() throws Exception
   {
     startTransport();
-    IChannel channel = getConnector().openChannel(TestSignalProtocol.TYPE);
+    IChannel channel = getConnector().openChannel(TestSignalProtocol.PROTOCOL_NAME);
     byte[] data = TinyData.getBytes();
     byte[] result = new Request2(channel, data).send();
     assertTrue(Arrays.equals(data, result));
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 9ddc0524ac..2ee0eb5c4c 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
@@ -12,17 +12,18 @@ package org.eclipse.net4j.tests;
 
 import org.eclipse.net4j.IAcceptorEvent;
 import org.eclipse.net4j.IBuffer;
+import org.eclipse.net4j.IBufferProvider;
 import org.eclipse.net4j.IChannel;
 import org.eclipse.net4j.IConnectorChannelsEvent;
+import org.eclipse.net4j.Net4jUtil;
 import org.eclipse.net4j.stream.ChannelInputStream;
 import org.eclipse.net4j.stream.ChannelOutputStream;
 import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory;
 import org.eclipse.net4j.util.container.IContainerDelta;
+import org.eclipse.net4j.util.container.IManagedContainer;
 import org.eclipse.net4j.util.event.IEvent;
 import org.eclipse.net4j.util.event.IListener;
 
-import org.eclipse.internal.net4j.TransportContainer;
-
 import java.io.BufferedReader;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -40,16 +41,17 @@ import java.util.concurrent.TimeUnit;
 public class TCPTransportTest extends AbstractTransportTest
 {
   @Override
-  protected TransportContainer createContainer()
+  protected IManagedContainer createContainer()
   {
-    TransportContainer container = super.createContainer();
+    IManagedContainer container = super.createContainer();
     container.registerFactory(new TestSignalServerProtocolFactory());
     return container;
   }
 
   protected IBuffer provideBuffer()
   {
-    return container.getBufferProvider().provideBuffer();
+    IBufferProvider bufferProvider = Net4jUtil.getBufferProvider(container);
+    return bufferProvider.provideBuffer();
   }
 
   public void testConnect() throws Exception
@@ -319,7 +321,8 @@ public class TCPTransportTest extends AbstractTransportTest
       {
         try
         {
-          ChannelOutputStream outputStream = new ChannelOutputStream(channel, container.getBufferProvider());
+          IBufferProvider bufferProvider = Net4jUtil.getBufferProvider(container);
+          ChannelOutputStream outputStream = new ChannelOutputStream(channel, bufferProvider);
           PrintStream printer = new PrintStream(outputStream);
           StringTokenizer tokenizer = HugeData.getTokenizer();
           while (tokenizer.hasMoreTokens())
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java
index c54f13525e..8d8d201fa8 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java
@@ -12,7 +12,7 @@ package org.eclipse.net4j.tests;
 
 import org.eclipse.net4j.IBuffer;
 import org.eclipse.net4j.IBufferPool;
-import org.eclipse.net4j.BufferUtil;
+import org.eclipse.net4j.Net4jUtil;
 import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
 import org.eclipse.net4j.util.ReflectUtil;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
@@ -26,7 +26,7 @@ import java.util.Collection;
  */
 public class TestBufferPool
 {
-  private static IBufferPool bufferPool = BufferUtil.createBufferPool();
+  private static IBufferPool bufferPool = Net4jUtil.createBufferPool();
 
   private static Collection memory = new ArrayList();
 
@@ -48,7 +48,7 @@ public class TestBufferPool
       buffers[i] = null;
     }
 
-    while (BufferUtil.getPooledBuffers(bufferPool) > 0 && allocate())
+    while (Net4jUtil.getPooledBuffers(bufferPool) > 0 && allocate())
     {
       Thread.sleep(200);
       ReflectUtil.dump(bufferPool);
@@ -59,7 +59,7 @@ public class TestBufferPool
 
   private static void msg()
   {
-    System.out.println("pooledBuffers = " + BufferUtil.getPooledBuffers(bufferPool));
+    System.out.println("pooledBuffers = " + Net4jUtil.getPooledBuffers(bufferPool));
   }
 
   private static boolean allocate()
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java
index 88d1e56298..4d53889136 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.signal.SignalReactor;
  */
 public class TestSignalProtocol extends SignalProtocol
 {
-  public static final String TYPE = "signal.protocol";
+  public static final String PROTOCOL_NAME = "signal.protocol";
 
   public static final short SIGNAL1 = 1;
 
@@ -30,7 +30,7 @@ public class TestSignalProtocol extends SignalProtocol
 
   public String getType()
   {
-    return TYPE;
+    return PROTOCOL_NAME;
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java
index a710ac624a..9e048a7df7 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java
@@ -9,9 +9,11 @@ import org.eclipse.internal.net4j.ServerProtocolFactory;
  */
 public class TestSignalServerProtocolFactory extends ServerProtocolFactory<TestSignalProtocol>
 {
+  public static final String TYPE = TestSignalProtocol.PROTOCOL_NAME;
+
   public TestSignalServerProtocolFactory()
   {
-    super(TestSignalProtocol.TYPE);
+    super(TYPE);
   }
 
   public TestSignalProtocol create(String description) throws ProductCreationException