Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-07-19 08:22:04 +0000
committerEike Stepper2012-07-19 08:22:04 +0000
commit1460904fd3c193ffaf809913b2983a400fce9d94 (patch)
tree72f3a17b75fedba3ae1060df1d32c9c7889be954 /plugins/org.eclipse.net4j.http.common
parent5f360965ae87478e0681899bf310a210cafc2c44 (diff)
downloadcdo-1460904fd3c193ffaf809913b2983a400fce9d94.tar.gz
cdo-1460904fd3c193ffaf809913b2983a400fce9d94.tar.xz
cdo-1460904fd3c193ffaf809913b2983a400fce9d94.zip
Fix line endings in master (dos2unix)
Diffstat (limited to 'plugins/org.eclipse.net4j.http.common')
-rw-r--r--plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.core.resources.prefs6
-rw-r--r--plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.launching.prefs6
-rw-r--r--plugins/org.eclipse.net4j.http.common/copyright.txt14
-rw-r--r--plugins/org.eclipse.net4j.http.common/plugin.properties22
-rw-r--r--plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java62
-rw-r--r--plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java30
-rw-r--r--plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPChannel.java220
-rw-r--r--plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPConnector.java1046
-rw-r--r--plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java88
-rw-r--r--plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java82
-rw-r--r--plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/messages.properties22
11 files changed, 799 insertions, 799 deletions
diff --git a/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.core.resources.prefs
index 8cbe76c800..d7159077f2 100644
--- a/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Tue Dec 13 11:33:57 GMT 2011
-eclipse.preferences.version=1
-encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+#Tue Dec 13 11:33:57 GMT 2011
+eclipse.preferences.version=1
+encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
diff --git a/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.launching.prefs
index 4658ec1435..556ed07a3c 100644
--- a/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.launching.prefs
+++ b/plugins/org.eclipse.net4j.http.common/.settings/org.eclipse.jdt.launching.prefs
@@ -1,3 +1,3 @@
-#Fri Sep 02 05:38:34 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
+#Fri Sep 02 05:38:34 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/plugins/org.eclipse.net4j.http.common/copyright.txt b/plugins/org.eclipse.net4j.http.common/copyright.txt
index 8f6328980e..0a0f67e6d7 100644
--- a/plugins/org.eclipse.net4j.http.common/copyright.txt
+++ b/plugins/org.eclipse.net4j.http.common/copyright.txt
@@ -1,8 +1,8 @@
-Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-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:
+Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+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 \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.http.common/plugin.properties b/plugins/org.eclipse.net4j.http.common/plugin.properties
index 14ddce49fe..a6f32e75a0 100644
--- a/plugins/org.eclipse.net4j.http.common/plugin.properties
+++ b/plugins/org.eclipse.net4j.http.common/plugin.properties
@@ -1,11 +1,11 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# 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
-
-pluginName = Net4j Signalling Platform Transport HTTP Common
-providerName = Eclipse Modeling Project
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# 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
+
+pluginName = Net4j Signalling Platform Transport HTTP Common
+providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
index dc329a1363..fe222dcd64 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
@@ -1,31 +1,31 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * 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.http.common;
-
-import org.eclipse.net4j.connector.IConnector;
-
-/**
- * A {@link IConnector connector} that implements polling HTTP transport.
- *
- * @author Eike Stepper
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface IHTTPConnector extends IConnector
-{
- public static final int DEFAULT_POLL_INTERVAL = 5 * 1000;// 5 seconds
-
- public static final int UNKNOWN_MAX_IDLE_TIME = -1;
-
- public String getConnectorID();
-
- public int getMaxIdleTime();
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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.http.common;
+
+import org.eclipse.net4j.connector.IConnector;
+
+/**
+ * A {@link IConnector connector} that implements polling HTTP transport.
+ *
+ * @author Eike Stepper
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface IHTTPConnector extends IConnector
+{
+ public static final int DEFAULT_POLL_INTERVAL = 5 * 1000;// 5 seconds
+
+ public static final int UNKNOWN_MAX_IDLE_TIME = -1;
+
+ public String getConnectorID();
+
+ public int getMaxIdleTime();
+}
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java
index 97150a2513..5d749f31c0 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java
@@ -1,15 +1,15 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * 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
- */
-
-/**
- * Transport layer extension with support for HTTP connections.
- */
-package org.eclipse.net4j.http.common;
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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
+ */
+
+/**
+ * Transport layer extension with support for HTTP connections.
+ */
+package org.eclipse.net4j.http.common;
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPChannel.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPChannel.java
index 5bab40030f..3a249abed7 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPChannel.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPChannel.java
@@ -1,110 +1,110 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * 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.http.internal.common;
-
-import org.eclipse.net4j.http.internal.common.HTTPConnector.ChannelOperation;
-import org.eclipse.net4j.util.WrappedException;
-
-import org.eclipse.spi.net4j.Channel;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Eike Stepper
- */
-public class HTTPChannel extends Channel
-{
- private long outputOperationCount = 1;// Open channel was 0 implicitely
-
- private long inputOperationCount;
-
- private Map<Long, ChannelOperation> inputOperationQuarantine = new ConcurrentHashMap<Long, ChannelOperation>();
-
- private CountDownLatch openAck = new CountDownLatch(1);
-
- private boolean inverseRemoved;
-
- public HTTPChannel()
- {
- }
-
- public long getOutputOperationCount()
- {
- return outputOperationCount;
- }
-
- public void increaseOutputOperationCount()
- {
- ++outputOperationCount;
- }
-
- public long getInputOperationCount()
- {
- return inputOperationCount;
- }
-
- public void increaseInputOperationCount()
- {
- ++inputOperationCount;
- }
-
- public void quarantineInputOperation(long count, ChannelOperation operation)
- {
- inputOperationQuarantine.put(count, operation);
- }
-
- public ChannelOperation getQuarantinedInputOperation(long count)
- {
- return inputOperationQuarantine.remove(count);
- }
-
- public void openAck()
- {
- openAck.countDown();
- }
-
- public void waitForOpenAck(long timeout)
- {
- try
- {
- openAck.await(timeout, TimeUnit.MILLISECONDS);
- }
- catch (InterruptedException ex)
- {
- throw WrappedException.wrap(ex);
- }
- }
-
- public boolean isInverseRemoved()
- {
- return inverseRemoved;
- }
-
- public void setInverseRemoved()
- {
- inverseRemoved = true;
- }
-
- @Override
- protected void doDeactivate() throws Exception
- {
- for (ChannelOperation operation : inputOperationQuarantine.values())
- {
- operation.dispose();
- }
-
- inputOperationQuarantine.clear();
- super.doDeactivate();
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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.http.internal.common;
+
+import org.eclipse.net4j.http.internal.common.HTTPConnector.ChannelOperation;
+import org.eclipse.net4j.util.WrappedException;
+
+import org.eclipse.spi.net4j.Channel;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Eike Stepper
+ */
+public class HTTPChannel extends Channel
+{
+ private long outputOperationCount = 1;// Open channel was 0 implicitely
+
+ private long inputOperationCount;
+
+ private Map<Long, ChannelOperation> inputOperationQuarantine = new ConcurrentHashMap<Long, ChannelOperation>();
+
+ private CountDownLatch openAck = new CountDownLatch(1);
+
+ private boolean inverseRemoved;
+
+ public HTTPChannel()
+ {
+ }
+
+ public long getOutputOperationCount()
+ {
+ return outputOperationCount;
+ }
+
+ public void increaseOutputOperationCount()
+ {
+ ++outputOperationCount;
+ }
+
+ public long getInputOperationCount()
+ {
+ return inputOperationCount;
+ }
+
+ public void increaseInputOperationCount()
+ {
+ ++inputOperationCount;
+ }
+
+ public void quarantineInputOperation(long count, ChannelOperation operation)
+ {
+ inputOperationQuarantine.put(count, operation);
+ }
+
+ public ChannelOperation getQuarantinedInputOperation(long count)
+ {
+ return inputOperationQuarantine.remove(count);
+ }
+
+ public void openAck()
+ {
+ openAck.countDown();
+ }
+
+ public void waitForOpenAck(long timeout)
+ {
+ try
+ {
+ openAck.await(timeout, TimeUnit.MILLISECONDS);
+ }
+ catch (InterruptedException ex)
+ {
+ throw WrappedException.wrap(ex);
+ }
+ }
+
+ public boolean isInverseRemoved()
+ {
+ return inverseRemoved;
+ }
+
+ public void setInverseRemoved()
+ {
+ inverseRemoved = true;
+ }
+
+ @Override
+ protected void doDeactivate() throws Exception
+ {
+ for (ChannelOperation operation : inputOperationQuarantine.values())
+ {
+ operation.dispose();
+ }
+
+ inputOperationQuarantine.clear();
+ super.doDeactivate();
+ }
+}
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPConnector.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPConnector.java
index 8e81b804bc..ce521cd7de 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPConnector.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/HTTPConnector.java
@@ -1,523 +1,523 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * 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.http.internal.common;
-
-import org.eclipse.net4j.buffer.IBuffer;
-import org.eclipse.net4j.channel.ChannelException;
-import org.eclipse.net4j.connector.ConnectorException;
-import org.eclipse.net4j.http.common.IHTTPConnector;
-import org.eclipse.net4j.http.internal.common.bundle.OM;
-import org.eclipse.net4j.http.internal.common.messages.Messages;
-import org.eclipse.net4j.protocol.IProtocol;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.security.INegotiationContext;
-
-import org.eclipse.spi.net4j.Connector;
-import org.eclipse.spi.net4j.InternalChannel;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-/**
- * @author Eike Stepper
- */
-public abstract class HTTPConnector extends Connector implements IHTTPConnector
-{
- private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HTTPConnector.class);
-
- private static final byte OPERATION_NONE = 0;
-
- private static final byte OPERATION_OPEN = 1;
-
- private static final byte OPERATION_OPEN_ACK = 2;
-
- private static final byte OPERATION_CLOSE = 3;
-
- private static final byte OPERATION_BUFFER = 4;
-
- private String connectorID;
-
- private transient Queue<ChannelOperation> outputOperations = new ConcurrentLinkedQueue<ChannelOperation>();
-
- private transient long lastTraffic;
-
- public static final int OPCODE_CONNECT = 1;
-
- public static final int OPCODE_DISCONNECT = 2;
-
- public static final int OPCODE_OPERATIONS = 3;
-
- public HTTPConnector()
- {
- markLastTraffic();
- }
-
- public String getConnectorID()
- {
- return connectorID;
- }
-
- public void setConnectorID(String connectorID)
- {
- this.connectorID = connectorID;
- }
-
- public Queue<ChannelOperation> getOutputQueue()
- {
- return outputOperations;
- }
-
- public long getLastTraffic()
- {
- return lastTraffic;
- }
-
- private void markLastTraffic()
- {
- lastTraffic = System.currentTimeMillis();
- }
-
- public void multiplexChannel(InternalChannel channel)
- {
- IBuffer buffer;
- long outputOperationCount;
-
- HTTPChannel httpChannel = (HTTPChannel)channel;
- synchronized (httpChannel)
- {
- Queue<IBuffer> channelQueue = httpChannel.getSendQueue();
- buffer = channelQueue.poll();
- outputOperationCount = httpChannel.getOutputOperationCount();
- httpChannel.increaseOutputOperationCount();
- }
-
- if (TRACER.isEnabled())
- {
- TRACER.format("Multiplexing {0} (count={1})", buffer.formatContent(true), outputOperationCount); //$NON-NLS-1$
- }
-
- outputOperations.add(new BufferChannelOperation(httpChannel.getID(), outputOperationCount, buffer));
- }
-
- /**
- * Writes operations from the {@link #outputOperations} to the passed stream. After each written operation
- * {@link #writeMoreOperations()} is asked whether to send more operations.
- *
- * @return <code>true</code> if more operations are in the {@link #outputOperations}, <code>false</code> otherwise.
- */
- public boolean writeOutputOperations(ExtendedDataOutputStream out) throws IOException
- {
- do
- {
- ChannelOperation operation = outputOperations.poll();
- if (operation == null && pollAgain())
- {
- operation = outputOperations.poll();
- }
-
- if (operation == null)
- {
- break;
- }
-
- operation.write(out);
- markLastTraffic();
- } while (writeMoreOperations());
-
- out.writeByte(OPERATION_NONE);
- return !outputOperations.isEmpty();
- }
-
- public void readInputOperations(ExtendedDataInputStream in) throws IOException
- {
- for (;;)
- {
- ChannelOperation operation;
- byte code = in.readByte();
- switch (code)
- {
- case OPERATION_OPEN:
- operation = new OpenChannelOperation(in);
- break;
-
- case OPERATION_OPEN_ACK:
- operation = new OpenAckChannelOperation(in);
- break;
-
- case OPERATION_CLOSE:
- operation = new CloseChannelOperation(in);
- break;
-
- case OPERATION_BUFFER:
- operation = new BufferChannelOperation(in);
- break;
-
- case OPERATION_NONE:
- return;
-
- default:
- throw new IOException("Invalid operation code: " + code); //$NON-NLS-1$
- }
-
- markLastTraffic();
- operation.execute();
- }
- }
-
- @Override
- protected INegotiationContext createNegotiationContext()
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- protected InternalChannel createChannel()
- {
- return new HTTPChannel();
- }
-
- @Override
- protected void registerChannelWithPeer(short channelID, long timeout, IProtocol<?> protocol) throws ChannelException
- {
- ChannelOperation operation = new OpenChannelOperation(channelID, protocol.getType());
- outputOperations.add(operation);
-
- HTTPChannel channel = (HTTPChannel)getChannel(channelID);
- channel.waitForOpenAck(timeout);
- }
-
- @Override
- protected void deregisterChannelFromPeer(InternalChannel channel) throws ChannelException
- {
- HTTPChannel httpChannel = (HTTPChannel)channel;
- if (!httpChannel.isInverseRemoved())
- {
- ChannelOperation operation = new CloseChannelOperation(httpChannel);
- outputOperations.add(operation);
- }
- }
-
- protected boolean pollAgain()
- {
- return false;
- }
-
- protected boolean writeMoreOperations()
- {
- return true;
- }
-
- /**
- * @author Eike Stepper
- */
- public abstract class ChannelOperation
- {
- private short channelID;
-
- private long operationCount;
-
- public ChannelOperation(short channelID, long operationCount)
- {
- this.channelID = channelID;
- this.operationCount = operationCount;
- }
-
- public ChannelOperation(ExtendedDataInputStream in) throws IOException
- {
- channelID = in.readShort();
- operationCount = in.readLong();
- }
-
- public void write(ExtendedDataOutputStream out) throws IOException
- {
- out.writeByte(getOperation());
- out.writeShort(channelID);
- out.writeLong(operationCount);
- }
-
- public abstract byte getOperation();
-
- public short getChannelID()
- {
- return channelID;
- }
-
- public long getOperationCount()
- {
- return operationCount;
- }
-
- public void execute()
- {
- HTTPChannel channel = (HTTPChannel)getChannel(getChannelID());
- long operationCount = getOperationCount();
- synchronized (channel)
- {
- // Execute preceding operations if necessary
- while (operationCount < channel.getInputOperationCount())
- {
- ChannelOperation operation = channel.getQuarantinedInputOperation(channel.getInputOperationCount());
- if (operation != null)
- {
- operation.doExecute(channel);
- channel.increaseInputOperationCount();
- }
- else
- {
- break;
- }
- }
-
- if (operationCount == channel.getInputOperationCount())
- {
- // Execute operation if possible
- doExecute(channel);
- channel.increaseInputOperationCount();
-
- // Execute following operations if possible
- for (;;)
- {
- ChannelOperation operation = channel.getQuarantinedInputOperation(++operationCount);
- if (operation != null)
- {
- operation.doExecute(channel);
- channel.increaseInputOperationCount();
- }
- else
- {
- break;
- }
- }
- }
- else
- {
- channel.quarantineInputOperation(operationCount, this);
- }
- }
- }
-
- public abstract void doExecute(HTTPChannel channel);
-
- public void dispose()
- {
- }
- }
-
- /**
- * @author Eike Stepper
- */
- private final class OpenChannelOperation extends ChannelOperation
- {
- private String protocolID;
-
- public OpenChannelOperation(short channelID, String protocolID)
- {
- super(channelID, 0);
- this.protocolID = protocolID;
- }
-
- public OpenChannelOperation(ExtendedDataInputStream in) throws IOException
- {
- super(in);
- protocolID = in.readString();
- }
-
- @Override
- public void write(ExtendedDataOutputStream out) throws IOException
- {
- super.write(out);
- out.writeString(protocolID);
- }
-
- @Override
- public byte getOperation()
- {
- return OPERATION_OPEN;
- }
-
- @Override
- public void execute()
- {
- HTTPChannel channel = (HTTPChannel)inverseOpenChannel(getChannelID(), protocolID);
- if (channel == null)
- {
- throw new ConnectorException(Messages.getString("HTTPConnector.0")); //$NON-NLS-1$
- }
-
- channel.increaseInputOperationCount();
- doExecute(channel);
- }
-
- @Override
- public void doExecute(HTTPChannel channel)
- {
- ChannelOperation operation = new OpenAckChannelOperation(getChannelID(), true);
- outputOperations.add(operation);
- }
- }
-
- /**
- * @author Eike Stepper
- */
- private final class OpenAckChannelOperation extends ChannelOperation
- {
- private boolean success;
-
- public OpenAckChannelOperation(short channelID, boolean success)
- {
- super(channelID, 0);
- this.success = success;
- }
-
- public OpenAckChannelOperation(ExtendedDataInputStream in) throws IOException
- {
- super(in);
- success = in.readBoolean();
- }
-
- @Override
- public void write(ExtendedDataOutputStream out) throws IOException
- {
- super.write(out);
- out.writeBoolean(success);
- }
-
- @Override
- public byte getOperation()
- {
- return OPERATION_OPEN_ACK;
- }
-
- @Override
- public void doExecute(HTTPChannel channel)
- {
- channel.openAck();
- }
- }
-
- /**
- * @author Eike Stepper
- */
- private final class CloseChannelOperation extends ChannelOperation
- {
- public CloseChannelOperation(HTTPChannel channel)
- {
- super(channel.getID(), channel.getOutputOperationCount());
- channel.increaseOutputOperationCount();
- }
-
- public CloseChannelOperation(ExtendedDataInputStream in) throws IOException
- {
- super(in);
- }
-
- @Override
- public byte getOperation()
- {
- return OPERATION_CLOSE;
- }
-
- @Override
- public void doExecute(HTTPChannel channel)
- {
- channel.setInverseRemoved();
- inverseCloseChannel(channel.getID());
- }
- }
-
- /**
- * @author Eike Stepper
- */
- private final class BufferChannelOperation extends ChannelOperation
- {
- private IBuffer buffer;
-
- public BufferChannelOperation(short channelID, long operationCount, IBuffer buffer)
- {
- super(channelID, operationCount);
- this.buffer = buffer;
- }
-
- public BufferChannelOperation(ExtendedDataInputStream in) throws IOException
- {
- super(in);
- int length = in.readShort();
- if (TRACER.isEnabled())
- {
- TRACER.format("Receiving Buffer operation: operationID={0}, length={1}", getOperationCount(), length); //$NON-NLS-1$
- }
-
- buffer = getConfig().getBufferProvider().provideBuffer();
- ByteBuffer byteBuffer = buffer.startPutting(getChannelID());
- for (int i = 0; i < length; i++)
- {
- byte b = in.readByte();
- byteBuffer.put(b);
- }
-
- buffer.flip();
- }
-
- @Override
- public void write(ExtendedDataOutputStream out) throws IOException
- {
- super.write(out);
-
- buffer.flip();
- ByteBuffer byteBuffer = buffer.getByteBuffer();
- byteBuffer.position(IBuffer.HEADER_SIZE);
-
- int length = byteBuffer.limit() - byteBuffer.position();
- out.writeShort(length);
- if (TRACER.isEnabled())
- {
- TRACER.format("Transmitting Buffer operation: operationID={0}, length={1}", getOperationCount(), length); //$NON-NLS-1$
- }
-
- for (int i = 0; i < length; i++)
- {
- byte b = byteBuffer.get();
- out.writeByte(b);
- }
-
- buffer.release();
- }
-
- @Override
- public byte getOperation()
- {
- return OPERATION_BUFFER;
- }
-
- @Override
- public void doExecute(HTTPChannel channel)
- {
- channel.handleBufferFromMultiplexer(buffer);
- buffer = null;
- }
-
- @Override
- public void dispose()
- {
- if (buffer != null)
- {
- buffer.release();
- buffer = null;
- }
-
- super.dispose();
- }
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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.http.internal.common;
+
+import org.eclipse.net4j.buffer.IBuffer;
+import org.eclipse.net4j.channel.ChannelException;
+import org.eclipse.net4j.connector.ConnectorException;
+import org.eclipse.net4j.http.common.IHTTPConnector;
+import org.eclipse.net4j.http.internal.common.bundle.OM;
+import org.eclipse.net4j.http.internal.common.messages.Messages;
+import org.eclipse.net4j.protocol.IProtocol;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.security.INegotiationContext;
+
+import org.eclipse.spi.net4j.Connector;
+import org.eclipse.spi.net4j.InternalChannel;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * @author Eike Stepper
+ */
+public abstract class HTTPConnector extends Connector implements IHTTPConnector
+{
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HTTPConnector.class);
+
+ private static final byte OPERATION_NONE = 0;
+
+ private static final byte OPERATION_OPEN = 1;
+
+ private static final byte OPERATION_OPEN_ACK = 2;
+
+ private static final byte OPERATION_CLOSE = 3;
+
+ private static final byte OPERATION_BUFFER = 4;
+
+ private String connectorID;
+
+ private transient Queue<ChannelOperation> outputOperations = new ConcurrentLinkedQueue<ChannelOperation>();
+
+ private transient long lastTraffic;
+
+ public static final int OPCODE_CONNECT = 1;
+
+ public static final int OPCODE_DISCONNECT = 2;
+
+ public static final int OPCODE_OPERATIONS = 3;
+
+ public HTTPConnector()
+ {
+ markLastTraffic();
+ }
+
+ public String getConnectorID()
+ {
+ return connectorID;
+ }
+
+ public void setConnectorID(String connectorID)
+ {
+ this.connectorID = connectorID;
+ }
+
+ public Queue<ChannelOperation> getOutputQueue()
+ {
+ return outputOperations;
+ }
+
+ public long getLastTraffic()
+ {
+ return lastTraffic;
+ }
+
+ private void markLastTraffic()
+ {
+ lastTraffic = System.currentTimeMillis();
+ }
+
+ public void multiplexChannel(InternalChannel channel)
+ {
+ IBuffer buffer;
+ long outputOperationCount;
+
+ HTTPChannel httpChannel = (HTTPChannel)channel;
+ synchronized (httpChannel)
+ {
+ Queue<IBuffer> channelQueue = httpChannel.getSendQueue();
+ buffer = channelQueue.poll();
+ outputOperationCount = httpChannel.getOutputOperationCount();
+ httpChannel.increaseOutputOperationCount();
+ }
+
+ if (TRACER.isEnabled())
+ {
+ TRACER.format("Multiplexing {0} (count={1})", buffer.formatContent(true), outputOperationCount); //$NON-NLS-1$
+ }
+
+ outputOperations.add(new BufferChannelOperation(httpChannel.getID(), outputOperationCount, buffer));
+ }
+
+ /**
+ * Writes operations from the {@link #outputOperations} to the passed stream. After each written operation
+ * {@link #writeMoreOperations()} is asked whether to send more operations.
+ *
+ * @return <code>true</code> if more operations are in the {@link #outputOperations}, <code>false</code> otherwise.
+ */
+ public boolean writeOutputOperations(ExtendedDataOutputStream out) throws IOException
+ {
+ do
+ {
+ ChannelOperation operation = outputOperations.poll();
+ if (operation == null && pollAgain())
+ {
+ operation = outputOperations.poll();
+ }
+
+ if (operation == null)
+ {
+ break;
+ }
+
+ operation.write(out);
+ markLastTraffic();
+ } while (writeMoreOperations());
+
+ out.writeByte(OPERATION_NONE);
+ return !outputOperations.isEmpty();
+ }
+
+ public void readInputOperations(ExtendedDataInputStream in) throws IOException
+ {
+ for (;;)
+ {
+ ChannelOperation operation;
+ byte code = in.readByte();
+ switch (code)
+ {
+ case OPERATION_OPEN:
+ operation = new OpenChannelOperation(in);
+ break;
+
+ case OPERATION_OPEN_ACK:
+ operation = new OpenAckChannelOperation(in);
+ break;
+
+ case OPERATION_CLOSE:
+ operation = new CloseChannelOperation(in);
+ break;
+
+ case OPERATION_BUFFER:
+ operation = new BufferChannelOperation(in);
+ break;
+
+ case OPERATION_NONE:
+ return;
+
+ default:
+ throw new IOException("Invalid operation code: " + code); //$NON-NLS-1$
+ }
+
+ markLastTraffic();
+ operation.execute();
+ }
+ }
+
+ @Override
+ protected INegotiationContext createNegotiationContext()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected InternalChannel createChannel()
+ {
+ return new HTTPChannel();
+ }
+
+ @Override
+ protected void registerChannelWithPeer(short channelID, long timeout, IProtocol<?> protocol) throws ChannelException
+ {
+ ChannelOperation operation = new OpenChannelOperation(channelID, protocol.getType());
+ outputOperations.add(operation);
+
+ HTTPChannel channel = (HTTPChannel)getChannel(channelID);
+ channel.waitForOpenAck(timeout);
+ }
+
+ @Override
+ protected void deregisterChannelFromPeer(InternalChannel channel) throws ChannelException
+ {
+ HTTPChannel httpChannel = (HTTPChannel)channel;
+ if (!httpChannel.isInverseRemoved())
+ {
+ ChannelOperation operation = new CloseChannelOperation(httpChannel);
+ outputOperations.add(operation);
+ }
+ }
+
+ protected boolean pollAgain()
+ {
+ return false;
+ }
+
+ protected boolean writeMoreOperations()
+ {
+ return true;
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ public abstract class ChannelOperation
+ {
+ private short channelID;
+
+ private long operationCount;
+
+ public ChannelOperation(short channelID, long operationCount)
+ {
+ this.channelID = channelID;
+ this.operationCount = operationCount;
+ }
+
+ public ChannelOperation(ExtendedDataInputStream in) throws IOException
+ {
+ channelID = in.readShort();
+ operationCount = in.readLong();
+ }
+
+ public void write(ExtendedDataOutputStream out) throws IOException
+ {
+ out.writeByte(getOperation());
+ out.writeShort(channelID);
+ out.writeLong(operationCount);
+ }
+
+ public abstract byte getOperation();
+
+ public short getChannelID()
+ {
+ return channelID;
+ }
+
+ public long getOperationCount()
+ {
+ return operationCount;
+ }
+
+ public void execute()
+ {
+ HTTPChannel channel = (HTTPChannel)getChannel(getChannelID());
+ long operationCount = getOperationCount();
+ synchronized (channel)
+ {
+ // Execute preceding operations if necessary
+ while (operationCount < channel.getInputOperationCount())
+ {
+ ChannelOperation operation = channel.getQuarantinedInputOperation(channel.getInputOperationCount());
+ if (operation != null)
+ {
+ operation.doExecute(channel);
+ channel.increaseInputOperationCount();
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ if (operationCount == channel.getInputOperationCount())
+ {
+ // Execute operation if possible
+ doExecute(channel);
+ channel.increaseInputOperationCount();
+
+ // Execute following operations if possible
+ for (;;)
+ {
+ ChannelOperation operation = channel.getQuarantinedInputOperation(++operationCount);
+ if (operation != null)
+ {
+ operation.doExecute(channel);
+ channel.increaseInputOperationCount();
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+ else
+ {
+ channel.quarantineInputOperation(operationCount, this);
+ }
+ }
+ }
+
+ public abstract void doExecute(HTTPChannel channel);
+
+ public void dispose()
+ {
+ }
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ private final class OpenChannelOperation extends ChannelOperation
+ {
+ private String protocolID;
+
+ public OpenChannelOperation(short channelID, String protocolID)
+ {
+ super(channelID, 0);
+ this.protocolID = protocolID;
+ }
+
+ public OpenChannelOperation(ExtendedDataInputStream in) throws IOException
+ {
+ super(in);
+ protocolID = in.readString();
+ }
+
+ @Override
+ public void write(ExtendedDataOutputStream out) throws IOException
+ {
+ super.write(out);
+ out.writeString(protocolID);
+ }
+
+ @Override
+ public byte getOperation()
+ {
+ return OPERATION_OPEN;
+ }
+
+ @Override
+ public void execute()
+ {
+ HTTPChannel channel = (HTTPChannel)inverseOpenChannel(getChannelID(), protocolID);
+ if (channel == null)
+ {
+ throw new ConnectorException(Messages.getString("HTTPConnector.0")); //$NON-NLS-1$
+ }
+
+ channel.increaseInputOperationCount();
+ doExecute(channel);
+ }
+
+ @Override
+ public void doExecute(HTTPChannel channel)
+ {
+ ChannelOperation operation = new OpenAckChannelOperation(getChannelID(), true);
+ outputOperations.add(operation);
+ }
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ private final class OpenAckChannelOperation extends ChannelOperation
+ {
+ private boolean success;
+
+ public OpenAckChannelOperation(short channelID, boolean success)
+ {
+ super(channelID, 0);
+ this.success = success;
+ }
+
+ public OpenAckChannelOperation(ExtendedDataInputStream in) throws IOException
+ {
+ super(in);
+ success = in.readBoolean();
+ }
+
+ @Override
+ public void write(ExtendedDataOutputStream out) throws IOException
+ {
+ super.write(out);
+ out.writeBoolean(success);
+ }
+
+ @Override
+ public byte getOperation()
+ {
+ return OPERATION_OPEN_ACK;
+ }
+
+ @Override
+ public void doExecute(HTTPChannel channel)
+ {
+ channel.openAck();
+ }
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ private final class CloseChannelOperation extends ChannelOperation
+ {
+ public CloseChannelOperation(HTTPChannel channel)
+ {
+ super(channel.getID(), channel.getOutputOperationCount());
+ channel.increaseOutputOperationCount();
+ }
+
+ public CloseChannelOperation(ExtendedDataInputStream in) throws IOException
+ {
+ super(in);
+ }
+
+ @Override
+ public byte getOperation()
+ {
+ return OPERATION_CLOSE;
+ }
+
+ @Override
+ public void doExecute(HTTPChannel channel)
+ {
+ channel.setInverseRemoved();
+ inverseCloseChannel(channel.getID());
+ }
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ private final class BufferChannelOperation extends ChannelOperation
+ {
+ private IBuffer buffer;
+
+ public BufferChannelOperation(short channelID, long operationCount, IBuffer buffer)
+ {
+ super(channelID, operationCount);
+ this.buffer = buffer;
+ }
+
+ public BufferChannelOperation(ExtendedDataInputStream in) throws IOException
+ {
+ super(in);
+ int length = in.readShort();
+ if (TRACER.isEnabled())
+ {
+ TRACER.format("Receiving Buffer operation: operationID={0}, length={1}", getOperationCount(), length); //$NON-NLS-1$
+ }
+
+ buffer = getConfig().getBufferProvider().provideBuffer();
+ ByteBuffer byteBuffer = buffer.startPutting(getChannelID());
+ for (int i = 0; i < length; i++)
+ {
+ byte b = in.readByte();
+ byteBuffer.put(b);
+ }
+
+ buffer.flip();
+ }
+
+ @Override
+ public void write(ExtendedDataOutputStream out) throws IOException
+ {
+ super.write(out);
+
+ buffer.flip();
+ ByteBuffer byteBuffer = buffer.getByteBuffer();
+ byteBuffer.position(IBuffer.HEADER_SIZE);
+
+ int length = byteBuffer.limit() - byteBuffer.position();
+ out.writeShort(length);
+ if (TRACER.isEnabled())
+ {
+ TRACER.format("Transmitting Buffer operation: operationID={0}, length={1}", getOperationCount(), length); //$NON-NLS-1$
+ }
+
+ for (int i = 0; i < length; i++)
+ {
+ byte b = byteBuffer.get();
+ out.writeByte(b);
+ }
+
+ buffer.release();
+ }
+
+ @Override
+ public byte getOperation()
+ {
+ return OPERATION_BUFFER;
+ }
+
+ @Override
+ public void doExecute(HTTPChannel channel)
+ {
+ channel.handleBufferFromMultiplexer(buffer);
+ buffer = null;
+ }
+
+ @Override
+ public void dispose()
+ {
+ if (buffer != null)
+ {
+ buffer.release();
+ buffer = null;
+ }
+
+ super.dispose();
+ }
+ }
+}
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java
index d3712e4e0a..9f426c8d47 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java
@@ -1,44 +1,44 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * 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.http.internal.common.bundle;
-
-import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OSGiActivator;
-import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.trace.OMTracer;
-
-/**
- * The <em>Operations & Maintenance</em> class of this bundle.
- *
- * @author Eike Stepper
- */
-public abstract class OM
-{
- public static final String BUNDLE_ID = "org.eclipse.net4j.http.common"; //$NON-NLS-1$
-
- public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
-
- public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
-
- public static final OMLogger LOG = BUNDLE.logger();
-
- /**
- * @author Eike Stepper
- */
- public static final class Activator extends OSGiActivator
- {
- public Activator()
- {
- super(BUNDLE);
- }
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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.http.internal.common.bundle;
+
+import org.eclipse.net4j.util.om.OMBundle;
+import org.eclipse.net4j.util.om.OMPlatform;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
+
+/**
+ * The <em>Operations & Maintenance</em> class of this bundle.
+ *
+ * @author Eike Stepper
+ */
+public abstract class OM
+{
+ public static final String BUNDLE_ID = "org.eclipse.net4j.http.common"; //$NON-NLS-1$
+
+ public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
+
+ public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
+
+ public static final OMLogger LOG = BUNDLE.logger();
+
+ /**
+ * @author Eike Stepper
+ */
+ public static final class Activator extends OSGiActivator
+ {
+ public Activator()
+ {
+ super(BUNDLE);
+ }
+ }
+}
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java
index c90a8c519c..a6dfc51b1e 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java
@@ -1,41 +1,41 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * 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:
- * Victor Roldan Betancort - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.net4j.http.internal.common.messages;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Victor Roldan Betancort
- */
-public class Messages
-{
- private static final String BUNDLE_NAME = "org.eclipse.net4j.http.internal.common.messages.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private Messages()
- {
- }
-
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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:
+ * Victor Roldan Betancort - initial API and implementation
+ * Eike Stepper - maintenance
+ */
+package org.eclipse.net4j.http.internal.common.messages;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.eclipse.net4j.http.internal.common.messages.messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+ private Messages()
+ {
+ }
+
+ public static String getString(String key)
+ {
+ try
+ {
+ return RESOURCE_BUNDLE.getString(key);
+ }
+ catch (MissingResourceException e)
+ {
+ return '!' + key + '!';
+ }
+ }
+}
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/messages.properties b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/messages.properties
index bd1165bb5f..77dd6533f4 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/messages.properties
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/messages.properties
@@ -1,11 +1,11 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# 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:
-# Victor Roldan Betancort - initial API and implementation
-# Eike Stepper - maintenance
-
-HTTPConnector.0=Could not open channel
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# 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:
+# Victor Roldan Betancort - initial API and implementation
+# Eike Stepper - maintenance
+
+HTTPConnector.0=Could not open channel

Back to the top