From 8bbad56489994baf6d8021043735639e7cb70fc0 Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Wed, 14 Feb 2007 15:44:53 +0000 Subject: *** empty log message *** --- .../src/org/eclipse/net4j/tests/SignalTest.java | 8 +- .../net4j/transport/AbstractConnector.java | 14 +- .../transport/ClientProtocolFactoryRegistry.java | 34 --- .../transport/ServerProtocolFactoryRegistry.java | 34 --- .../net4j/transport/tcp/AbstractTCPConnector.java | 4 +- .../transport/tcp/ClientTCPConnectorImpl.java | 7 +- .../transport/tcp/TCPConnectorDescriptionImpl.java | 6 + .../transport/tcp/TCPConnectorFactoryImpl.java | 31 +++ .../src/org/eclipse/net4j/transport/Connector.java | 4 +- .../net4j/transport/ConnectorDescription.java | 2 +- .../eclipse/net4j/transport/ConnectorFactory.java | 21 ++ .../net4j/transport/TransportContainer.java | 2 + .../org/eclipse/net4j/transport/TransportUtil.java | 243 +++++++++++++++++++++ .../eclipse/net4j/transport/tcp/TCPConnector.java | 25 --- .../net4j/transport/tcp/TCPConnectorFactory.java | 21 ++ .../src/org/eclipse/net4j/user/Credentials.java | 19 ++ .../src/org/eclipse/net4j/user/User.java | 19 ++ .../src/org/eclipse/net4j/util/Net4jUtil.java | 6 +- 18 files changed, 381 insertions(+), 119 deletions(-) delete mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ClientProtocolFactoryRegistry.java delete mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactoryRegistry.java create mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPConnectorFactoryImpl.java create mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorFactory.java create mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java delete mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPConnector.java create mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPConnectorFactory.java create mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java create mode 100644 plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java 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 23a813e1f9..e6bff219ad 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 @@ -22,7 +22,7 @@ import org.eclipse.net4j.util.Net4jUtil; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.transport.tcp.AbstractTCPConnector; +import org.eclipse.internal.net4j.transport.AbstractConnector; import org.eclipse.internal.net4j.transport.tcp.TCPAcceptorImpl; import org.eclipse.internal.net4j.transport.tcp.TCPSelectorImpl; @@ -42,7 +42,7 @@ public class SignalTest extends AbstractOMTest private TCPAcceptorImpl acceptor; - private AbstractTCPConnector connector; + private AbstractConnector connector; @Override protected void setUp() throws Exception @@ -57,7 +57,7 @@ public class SignalTest extends AbstractOMTest assertTrue(selector.isActive()); acceptor = (TCPAcceptorImpl)Net4jUtil.createTCPAcceptor(bufferPool, selector); - connector = (AbstractTCPConnector)Net4jUtil.createTCPConnector(bufferPool, selector, "localhost"); + connector = (AbstractConnector)Net4jUtil.createTCPConnector(bufferPool, selector, "localhost"); } @Override @@ -68,7 +68,7 @@ public class SignalTest extends AbstractOMTest if (connector != null) { connector.disconnect(); - assertFalse(connector.isActive()); + assertFalse(LifecycleUtil.isActive(connector)); assertFalse(connector.isConnected()); connector = null; } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java index f36c728c16..b69fe543a2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java @@ -10,11 +10,6 @@ **************************************************************************/ package org.eclipse.internal.net4j.transport; -import static org.eclipse.net4j.transport.Connector.State.CONNECTED; -import static org.eclipse.net4j.transport.Connector.State.CONNECTING; -import static org.eclipse.net4j.transport.Connector.State.DISCONNECTED; -import static org.eclipse.net4j.transport.Connector.State.NEGOTIATING; - import org.eclipse.net4j.transport.Buffer; import org.eclipse.net4j.transport.BufferProvider; import org.eclipse.net4j.transport.Channel; @@ -46,8 +41,7 @@ import java.util.concurrent.TimeUnit; /** * @author Eike Stepper */ -public abstract class AbstractConnector extends AbstractLifecycle implements - Connector, BufferProvider +public abstract class AbstractConnector extends AbstractLifecycle implements Connector, BufferProvider { private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_CONNECTOR, AbstractConnector.class); @@ -61,7 +55,7 @@ public abstract class AbstractConnector -{ - public void register(ProtocolFactory factory) - { - String key = factory.getProtocolID(); - if (containsKey(key)) - { - throw new IllegalStateException("Duplicate key: " + factory); - } - - put(key, factory); - } - - @Override - protected ProtocolFactory register(String protocolName, ProtocolFactory factory) - { - if (factory.isForClients()) - { - return super.register(protocolName, factory); - } - else - { - throw new IllegalArgumentException("Protocol factory is not for clients: " + factory); - } - } -} \ No newline at end of file diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactoryRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactoryRegistry.java deleted file mode 100644 index db291e1a86..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactoryRegistry.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.eclipse.internal.net4j.transport; - -import org.eclipse.net4j.transport.ProtocolFactory; -import org.eclipse.net4j.util.registry.HashMapRegistry; - -/** - * @author Eike Stepper - */ -public final class ServerProtocolFactoryRegistry extends HashMapRegistry -{ - public void register(ProtocolFactory factory) - { - String key = factory.getProtocolID(); - if (containsKey(key)) - { - throw new IllegalStateException("Duplicate key: " + factory); - } - - put(key, factory); - } - - @Override - protected ProtocolFactory register(String protocolName, ProtocolFactory factory) - { - if (factory.isForServers()) - { - return super.register(protocolName, factory); - } - else - { - throw new IllegalArgumentException("Protocol factory is not for servers: " + factory); - } - } -} \ No newline at end of file diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java index e0b68033b7..edf647d143 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/AbstractTCPConnector.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.transport.Buffer; import org.eclipse.net4j.transport.Channel; import org.eclipse.net4j.transport.Connector; import org.eclipse.net4j.transport.ConnectorException; -import org.eclipse.net4j.transport.tcp.TCPConnectorDescription; import org.eclipse.net4j.transport.tcp.TCPSelector; import org.eclipse.net4j.transport.tcp.TCPSelectorListener; import org.eclipse.net4j.util.Net4jUtil; @@ -36,8 +35,7 @@ import java.util.Queue; /** * @author Eike Stepper */ -public abstract class AbstractTCPConnector extends AbstractConnector implements - Connector, TCPSelectorListener.Active +public abstract class AbstractTCPConnector extends AbstractConnector implements Connector, TCPSelectorListener.Active { private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_CONNECTOR, AbstractTCPConnector.class); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java index 0f91a63559..de69f941e1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/ClientTCPConnectorImpl.java @@ -10,6 +10,8 @@ **************************************************************************/ package org.eclipse.internal.net4j.transport.tcp; +import org.eclipse.net4j.transport.tcp.TCPConnectorDescription; + import java.net.InetAddress; import java.net.InetSocketAddress; @@ -47,8 +49,9 @@ public class ClientTCPConnectorImpl extends AbstractTCPConnector protected void onActivate() throws Exception { super.onActivate(); - InetAddress addr = InetAddress.getByName(getDescription().getHost()); - InetSocketAddress sAddr = new InetSocketAddress(addr, getDescription().getPort()); + TCPConnectorDescription description = (TCPConnectorDescription)getDescription(); + InetAddress addr = InetAddress.getByName(description.getHost()); + InetSocketAddress sAddr = new InetSocketAddress(addr, description.getPort()); getSocketChannel().connect(sAddr); } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPConnectorDescriptionImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPConnectorDescriptionImpl.java index 5c2701fe4b..58616508e5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPConnectorDescriptionImpl.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPConnectorDescriptionImpl.java @@ -11,6 +11,7 @@ package org.eclipse.internal.net4j.transport.tcp; import org.eclipse.net4j.transport.tcp.TCPConnectorDescription; +import org.eclipse.net4j.transport.tcp.TCPConnectorFactory; import org.eclipse.net4j.util.ObjectUtil; import java.io.Serializable; @@ -33,6 +34,11 @@ public class TCPConnectorDescriptionImpl implements TCPConnectorDescription, Clo this.port = port; } + public String getFactoryID() + { + return TCPConnectorFactory.ID; + } + public String getHost() { return host; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPConnectorFactoryImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPConnectorFactoryImpl.java new file mode 100644 index 0000000000..eb0748df7c --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/tcp/TCPConnectorFactoryImpl.java @@ -0,0 +1,31 @@ +/*************************************************************************** + * 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 + **************************************************************************/ +package org.eclipse.internal.net4j.transport.tcp; + +import org.eclipse.net4j.transport.Connector; +import org.eclipse.net4j.transport.tcp.TCPConnectorFactory; + +/** + * @author Eike Stepper + */ +public class TCPConnectorFactoryImpl implements TCPConnectorFactory +{ + public String getID() + { + return ID; + } + + public Connector createConnector() + { + ClientTCPConnectorImpl connector = new ClientTCPConnectorImpl(); + return connector; + } +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java index 6d07c5a610..50dcc9d7c1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java @@ -29,7 +29,7 @@ import org.eclipse.internal.net4j.transport.ChannelImpl; * * @author Eike Stepper */ -public interface Connector +public interface Connector { public Integer getID(); @@ -39,7 +39,7 @@ public interface Connector public boolean isServer(); - public DESCRIPTION getDescription(); + public ConnectorDescription getDescription(); public ConnectorCredentials getCredentials(); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorDescription.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorDescription.java index 219c4b0663..ce27d8898f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorDescription.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorDescription.java @@ -15,5 +15,5 @@ package org.eclipse.net4j.transport; */ public interface ConnectorDescription { - public String getDisplayName(); + public String getFactoryID(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorFactory.java new file mode 100644 index 0000000000..3d0b6e63dd --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorFactory.java @@ -0,0 +1,21 @@ +/*************************************************************************** + * 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 + **************************************************************************/ +package org.eclipse.net4j.transport; + +/** + * @author Eike Stepper + */ +public interface ConnectorFactory +{ + public String getID(); + + public Connector createConnector(); +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportContainer.java index 6e925a054b..01be042087 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportContainer.java @@ -19,6 +19,8 @@ public interface TransportContainer { public BufferPool getBufferPool(); + public IRegistry getConnectorFactoryRegistry(); + public IRegistry getProtocolFactoryRegistry(); public IRegistry getConnectorRegistry(); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java new file mode 100644 index 0000000000..82600c48c7 --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java @@ -0,0 +1,243 @@ +/*************************************************************************** + * 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 + **************************************************************************/ +package org.eclipse.net4j.transport; + +import org.eclipse.net4j.transport.Connector.Type; +import org.eclipse.net4j.transport.tcp.TCPAcceptor; +import org.eclipse.net4j.transport.tcp.TCPConnectorDescription; +import org.eclipse.net4j.transport.tcp.TCPSelector; +import org.eclipse.net4j.util.registry.HashMapRegistry; +import org.eclipse.net4j.util.registry.IRegistry; + +import org.eclipse.internal.net4j.transport.BufferFactoryImpl; +import org.eclipse.internal.net4j.transport.BufferPoolImpl; +import org.eclipse.internal.net4j.transport.BufferUtil; +import org.eclipse.internal.net4j.transport.ProtocolFactoryIDImpl; +import org.eclipse.internal.net4j.transport.embedded.ClientEmbeddedConnectorImpl; +import org.eclipse.internal.net4j.transport.tcp.ClientTCPConnectorImpl; +import org.eclipse.internal.net4j.transport.tcp.TCPAcceptorImpl; +import org.eclipse.internal.net4j.transport.tcp.TCPConnectorDescriptionImpl; +import org.eclipse.internal.net4j.transport.tcp.TCPSelectorImpl; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.Map.Entry; + +/** + * @author Eike Stepper + */ +public final class TransportUtil +{ + private TransportUtil() + { + } + + public static BufferProvider createBufferFactory(short bufferCapacity) + { + return new BufferFactoryImpl(bufferCapacity); + } + + public static BufferProvider createBufferFactory() + { + return new BufferFactoryImpl(BufferUtil.DEFAULT_BUFFER_CAPACITY); + } + + public static BufferPool createBufferPool(BufferProvider factory) + { + return new BufferPoolImpl(factory); + } + + public static BufferPool createBufferPool(short bufferCapacity) + { + return createBufferPool(createBufferFactory(bufferCapacity)); + } + + public static BufferPool createBufferPool() + { + return createBufferPool(createBufferFactory()); + } + + public static ProtocolFactoryID createProtocolFactoryID(Type type, String protocolID) + { + return new ProtocolFactoryIDImpl(type, protocolID); + } + + public static Connector createConnector(TransportContainer container, String connectorFactoryID) + { + IRegistry registry = container.getConnectorFactoryRegistry(); + if (registry == null) + { + return null; + } + + ConnectorFactory connectorFactory = registry.get(connectorFactoryID); + if (connectorFactory == null) + { + return null; + } + + return connectorFactory.createConnector(); + } + + public static Connector createEmbeddedConnector(BufferProvider bufferProvider) + { + ClientEmbeddedConnectorImpl connector = new ClientEmbeddedConnectorImpl(); + connector.setBufferProvider(bufferProvider); + return connector; + } + + public static TCPAcceptor createTCPAcceptor(BufferProvider bufferProvider, TCPSelector selector, String address, + int port) + { + TCPAcceptorImpl acceptor = new TCPAcceptorImpl(); + acceptor.setBufferProvider(bufferProvider); + acceptor.setSelector(selector); + acceptor.setListenPort(port); + acceptor.setListenAddr(address); + return acceptor; + } + + public static TCPAcceptor createTCPAcceptor(BufferProvider bufferProvider, TCPSelector selector) + { + return createTCPAcceptor(bufferProvider, selector, TCPAcceptor.DEFAULT_ADDRESS, TCPAcceptor.DEFAULT_PORT); + } + + public static Connector createTCPConnector(BufferProvider bufferProvider, TCPSelector selector, String host, int port) + { + ClientTCPConnectorImpl connector = new ClientTCPConnectorImpl(); + connector.setBufferProvider(bufferProvider); + connector.setSelector(selector); + connector.setDescription(new TCPConnectorDescriptionImpl(host, port)); + return connector; + } + + public static Connector createTCPConnector(BufferProvider bufferProvider, TCPSelector selector, String host) + { + return createTCPConnector(bufferProvider, selector, host, TCPConnectorDescription.DEFAULT_PORT); + } + + public static TCPSelector createTCPSelector() + { + return new TCPSelectorImpl(); + } + + public static Collection getChannels(TransportContainer container, String protocolID, Set types) + { + if (types == null) + { + types = ProtocolFactory.SYMMETRIC; + } + + IRegistry channelRegistry = container.getChannelRegistry(); + if (channelRegistry == null) + { + return null; + } + + Collection channels = channelRegistry.values(); + Collection result = new ArrayList(channels.size()); + for (Channel channel : channels) + { + if (types.contains(channel.getConnector().getType())) + { + if (protocolID == null || protocolID.length() == 0) + { + result.add(channel); + } + else + { + if (channel.getReceiveHandler() instanceof Protocol) + { + Protocol protocol = (Protocol)channel.getReceiveHandler(); + if (protocolID.equals(protocol.getProtocolID())) + { + result.add(channel); + } + } + } + } + } + + return result; + } + + public static Collection getChannels(TransportContainer container, String protocolID) + { + return getChannels(container, protocolID, null); + } + + public static Collection getChannels(TransportContainer container, Set types) + { + return getChannels(container, null, types); + } + + public static Map> createProtocolFactoryRegistries(Set types) + { + Map> result = new HashMap(); + for (Type type : types) + { + result.put(type, new HashMapRegistry()); + } + + return result; + } + + public static Set registerProtocolFactory(ProtocolFactory factory, + Map> registries) + { + Set result = new HashSet(); + for (Entry> entry : registries.entrySet()) + { + Type type = entry.getKey(); + IRegistry registry = entry.getValue(); + if (factory.getConnectorTypes().contains(type)) + { + ProtocolFactoryID id = factory.createID(type); + if (!registry.containsKey(id)) + { + registry.put(id, factory); + } + else + { + result.add(type); + } + } + } + + return result; + } + + public static Set deregisterProtocolFactory(ProtocolFactory factory, + Map> registries) + { + Set result = new HashSet(); + for (Entry> entry : registries.entrySet()) + { + Type type = entry.getKey(); + IRegistry registry = entry.getValue(); + if (factory.getConnectorTypes().contains(type)) + { + ProtocolFactoryID id = factory.createID(type); + ProtocolFactory old = registry.remove(id); + if (old != null) + { + result.add(type); + } + } + } + + return result; + } +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPConnector.java deleted file mode 100644 index 536592296f..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPConnector.java +++ /dev/null @@ -1,25 +0,0 @@ -/*************************************************************************** - * 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 - **************************************************************************/ -package org.eclipse.net4j.transport.tcp; - -import org.eclipse.net4j.transport.Connector; - -/** - * @author Eike Stepper - */ -public interface TCPConnector extends Connector -{ - public static final int DEFAULT_PORT = TCPAcceptor.DEFAULT_PORT; - - public int getPort(); - - public String getHost(); -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPConnectorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPConnectorFactory.java new file mode 100644 index 0000000000..e98f8d47fb --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/tcp/TCPConnectorFactory.java @@ -0,0 +1,21 @@ +/*************************************************************************** + * 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 + **************************************************************************/ +package org.eclipse.net4j.transport.tcp; + +import org.eclipse.net4j.transport.ConnectorFactory; + +/** + * @author Eike Stepper + */ +public interface TCPConnectorFactory extends ConnectorFactory +{ + public static final String ID = "TCP"; +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java new file mode 100644 index 0000000000..60a87ac92e --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java @@ -0,0 +1,19 @@ +/*************************************************************************** + * 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 + **************************************************************************/ +package org.eclipse.net4j.user; + +/** + * @author Eike Stepper + */ +public interface Credentials +{ + public String getID(); +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java new file mode 100644 index 0000000000..9b07af0eb0 --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java @@ -0,0 +1,19 @@ +/*************************************************************************** + * 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 + **************************************************************************/ +package org.eclipse.net4j.user; + +/** + * @author Eike Stepper + */ +public interface User +{ + public String getID(); +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/Net4jUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/Net4jUtil.java index a119032e42..86afa5a8ff 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/Net4jUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/Net4jUtil.java @@ -106,8 +106,7 @@ public final class Net4jUtil return createTCPAcceptor(bufferProvider, selector, TCPAcceptor.DEFAULT_ADDRESS, TCPAcceptor.DEFAULT_PORT); } - public static Connector createTCPConnector(BufferProvider bufferProvider, - TCPSelector selector, String host, int port) + public static Connector createTCPConnector(BufferProvider bufferProvider, TCPSelector selector, String host, int port) { ClientTCPConnectorImpl connector = new ClientTCPConnectorImpl(); connector.setBufferProvider(bufferProvider); @@ -116,8 +115,7 @@ public final class Net4jUtil return connector; } - public static Connector createTCPConnector(BufferProvider bufferProvider, - TCPSelector selector, String host) + public static Connector createTCPConnector(BufferProvider bufferProvider, TCPSelector selector, String host) { return createTCPConnector(bufferProvider, selector, host, TCPConnectorDescription.DEFAULT_PORT); } -- cgit v1.2.3