[232648] Provide an HTTPConnector

https://bugs.eclipse.org/bugs/show_bug.cgi?id=232648

5 files changed, 61 insertions, 6 deletions

diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/INet4jTransportServlet.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/INet4jTransportServlet.java
index 4d223b1aaa..ce1322ed4d 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/INet4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/INet4jTransportServlet.java
@@ -34,7 +34,7 @@ public interface INet4jTransportServlet extends Servlet
   {
     public IHTTPConnector[] handleList(String connectorID);
 
-    public String handleConnect(String userID);
+    public IHTTPConnector handleConnect(String userID);
 
     public void handleOpenChannel(String connectorID, short channelIndex, int channelID, String protocolType);
 
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPAcceptor.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPAcceptor.java
index 63d4d017ae..3b411d6490 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPAcceptor.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPAcceptor.java
@@ -37,7 +37,7 @@ public class HTTPAcceptor extends Acceptor implements IHTTPAcceptor, INet4jTrans
 {
   public static final int DEFAULT_CONNECTOR_ID_LENGTH = 32;
 
-  public static final int DEFAULT_MAX_IDLE_TIME = 10 * 60 * 1000; // 10 minutes
+  public static final int DEFAULT_MAX_IDLE_TIME = 60 * 1000; // 1 minute
 
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HTTPAcceptor.class);
 
@@ -133,7 +133,7 @@ public class HTTPAcceptor extends Acceptor implements IHTTPAcceptor, INet4jTrans
     return new IHTTPConnector[] { httpConnectors.get(connectorID) };
   }
 
-  public String handleConnect(String userID)
+  public IHTTPConnector handleConnect(String userID)
   {
     String connectorID = createConnectorID(userID);
     System.out.println("HELLO " + userID + " (" + connectorID + ")");
@@ -145,7 +145,7 @@ public class HTTPAcceptor extends Acceptor implements IHTTPAcceptor, INet4jTrans
     addConnector(connector);
     connector.activate();
 
-    return connectorID;
+    return connector;
   }
 
   public void handleOpenChannel(String connectorID, short channelIndex, int channelID, String protocolType)
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPChannel.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPChannel.java
new file mode 100644
index 0000000000..0fe0d0e233
--- /dev/null
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPChannel.java
@@ -0,0 +1,47 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 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
+ **************************************************************************/
+package org.eclipse.net4j.internal.http;
+
+import org.eclipse.internal.net4j.channel.Channel;
+
+/**
+ * @author Eike Stepper
+ */
+public class HTTPChannel extends Channel
+{
+  private long inputBufferCount;
+
+  private long outputBufferCount;
+
+  public HTTPChannel()
+  {
+  }
+
+  public long getInputBufferCount()
+  {
+    return inputBufferCount;
+  }
+
+  public void increaseInputBufferCount()
+  {
+    ++inputBufferCount;
+  }
+
+  public long getOutputBufferCount()
+  {
+    return outputBufferCount;
+  }
+
+  public void increaseOutputBufferCount()
+  {
+    ++outputBufferCount;
+  }
+}
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPConnector.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPConnector.java
index 2441690824..2924a0bdfd 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPConnector.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPConnector.java
@@ -18,6 +18,7 @@ import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.security.INegotiationContext;
 
 import org.eclipse.internal.net4j.buffer.Buffer;
+import org.eclipse.internal.net4j.channel.Channel;
 import org.eclipse.internal.net4j.channel.InternalChannel;
 import org.eclipse.internal.net4j.connector.Connector;
 
@@ -71,4 +72,10 @@ public abstract class HTTPConnector extends Connector implements IHTTPConnector
   {
     throw new UnsupportedOperationException();
   }
+
+  @Override
+  protected Channel createChannelInstance()
+  {
+    return new HTTPChannel();
+  }
 }
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/Net4jTransportServlet.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/Net4jTransportServlet.java
index 038f798d06..b2801a01a4 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/Net4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/Net4jTransportServlet.java
@@ -164,8 +164,9 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
     try
     {
       String userID = in.readString();
-      String connectorID = requestHandler.handleConnect(userID);
-      out.writeString(connectorID);
+      IHTTPConnector connector = requestHandler.handleConnect(userID);
+      out.writeString(connector.getConnectorID());
+      out.writeInt(connector.getMaxIdleTime());
     }
     catch (Exception ex)
     {