Moved ConnectionDispatcher and ConnectionRegistry to plugins package.

briar-android/src/org/briarproject/android/contact/ContactListActivity.java

@@ -40,7 +40,7 @@ import org.briarproject.api.event.EventListener;
 import org.briarproject.api.event.MessageAddedEvent;
 import org.briarproject.api.event.MessageExpiredEvent;
 import org.briarproject.api.messaging.GroupId;
-import org.briarproject.api.transport.ConnectionRegistry;
+import org.briarproject.api.plugins.ConnectionRegistry;
 
 import android.content.Intent;
 import android.content.res.Resources;

briar-api/src/org/briarproject/api/plugins/ConnectionDispatcher.java

@@ -1,9 +1,7 @@
-package org.briarproject.api.transport;
+package org.briarproject.api.plugins;
 
 import org.briarproject.api.ContactId;
 import org.briarproject.api.TransportId;
-import org.briarproject.api.plugins.TransportConnectionReader;
-import org.briarproject.api.plugins.TransportConnectionWriter;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
 
 public interface ConnectionDispatcher {

briar-api/src/org/briarproject/api/plugins/ConnectionRegistry.java

@@ -1,4 +1,4 @@
-package org.briarproject.api.transport;
+package org.briarproject.api.plugins;
 
 import java.util.Collection;
 

briar-core/src/org/briarproject/invitation/AliceConnector.java

@@ -21,6 +21,7 @@ import org.briarproject.api.crypto.PseudoRandom;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.messaging.GroupFactory;
+import org.briarproject.api.plugins.ConnectionDispatcher;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
 import org.briarproject.api.serial.Reader;
@@ -28,7 +29,6 @@ import org.briarproject.api.serial.ReaderFactory;
 import org.briarproject.api.serial.Writer;
 import org.briarproject.api.serial.WriterFactory;
 import org.briarproject.api.system.Clock;
-import org.briarproject.api.transport.ConnectionDispatcher;
 import org.briarproject.api.transport.StreamReader;
 import org.briarproject.api.transport.StreamReaderFactory;
 import org.briarproject.api.transport.StreamWriter;

briar-core/src/org/briarproject/invitation/BobConnector.java

@@ -21,6 +21,7 @@ import org.briarproject.api.crypto.PseudoRandom;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.messaging.GroupFactory;
+import org.briarproject.api.plugins.ConnectionDispatcher;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
 import org.briarproject.api.serial.Reader;
@@ -28,7 +29,6 @@ import org.briarproject.api.serial.ReaderFactory;
 import org.briarproject.api.serial.Writer;
 import org.briarproject.api.serial.WriterFactory;
 import org.briarproject.api.system.Clock;
-import org.briarproject.api.transport.ConnectionDispatcher;
 import org.briarproject.api.transport.StreamReader;
 import org.briarproject.api.transport.StreamReaderFactory;
 import org.briarproject.api.transport.StreamWriter;

briar-core/src/org/briarproject/invitation/Connector.java

@@ -43,6 +43,7 @@ import org.briarproject.api.db.NoSuchTransportException;
 import org.briarproject.api.invitation.InvitationConstants;
 import org.briarproject.api.messaging.Group;
 import org.briarproject.api.messaging.GroupFactory;
+import org.briarproject.api.plugins.ConnectionDispatcher;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
 import org.briarproject.api.serial.Reader;
@@ -50,7 +51,6 @@ import org.briarproject.api.serial.ReaderFactory;
 import org.briarproject.api.serial.Writer;
 import org.briarproject.api.serial.WriterFactory;
 import org.briarproject.api.system.Clock;
-import org.briarproject.api.transport.ConnectionDispatcher;
 import org.briarproject.api.transport.Endpoint;
 import org.briarproject.api.transport.StreamReaderFactory;
 import org.briarproject.api.transport.StreamWriterFactory;

briar-core/src/org/briarproject/invitation/ConnectorGroup.java

@@ -27,12 +27,12 @@ import org.briarproject.api.invitation.InvitationListener;
 import org.briarproject.api.invitation.InvitationState;
 import org.briarproject.api.invitation.InvitationTask;
 import org.briarproject.api.messaging.GroupFactory;
+import org.briarproject.api.plugins.ConnectionDispatcher;
 import org.briarproject.api.plugins.PluginManager;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.serial.ReaderFactory;
 import org.briarproject.api.serial.WriterFactory;
 import org.briarproject.api.system.Clock;
-import org.briarproject.api.transport.ConnectionDispatcher;
 import org.briarproject.api.transport.StreamReaderFactory;
 import org.briarproject.api.transport.StreamWriterFactory;
 

briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java

@@ -10,11 +10,11 @@ import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.invitation.InvitationTask;
 import org.briarproject.api.invitation.InvitationTaskFactory;
 import org.briarproject.api.messaging.GroupFactory;
+import org.briarproject.api.plugins.ConnectionDispatcher;
 import org.briarproject.api.plugins.PluginManager;
 import org.briarproject.api.serial.ReaderFactory;
 import org.briarproject.api.serial.WriterFactory;
 import org.briarproject.api.system.Clock;
-import org.briarproject.api.transport.ConnectionDispatcher;
 import org.briarproject.api.transport.StreamReaderFactory;
 import org.briarproject.api.transport.StreamWriterFactory;
 

briar-core/src/org/briarproject/plugins/ConnectionDispatcherImpl.java

@@ -1,4 +1,4 @@
-package org.briarproject.transport;
+package org.briarproject.plugins;
 
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
@@ -19,11 +19,11 @@ import org.briarproject.api.db.DbException;
 import org.briarproject.api.lifecycle.IoExecutor;
 import org.briarproject.api.messaging.MessagingSession;
 import org.briarproject.api.messaging.MessagingSessionFactory;
+import org.briarproject.api.plugins.ConnectionDispatcher;
+import org.briarproject.api.plugins.ConnectionRegistry;
 import org.briarproject.api.plugins.TransportConnectionReader;
 import org.briarproject.api.plugins.TransportConnectionWriter;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
-import org.briarproject.api.transport.ConnectionDispatcher;
-import org.briarproject.api.transport.ConnectionRegistry;
 import org.briarproject.api.transport.StreamContext;
 import org.briarproject.api.transport.StreamReader;
 import org.briarproject.api.transport.StreamReaderFactory;

briar-core/src/org/briarproject/plugins/ConnectionRegistryImpl.java

@@ -1,4 +1,4 @@
-package org.briarproject.transport;
+package org.briarproject.plugins;
 
 import static java.util.logging.Level.INFO;
 
@@ -15,7 +15,7 @@ import org.briarproject.api.TransportId;
 import org.briarproject.api.event.ContactConnectedEvent;
 import org.briarproject.api.event.ContactDisconnectedEvent;
 import org.briarproject.api.event.EventBus;
-import org.briarproject.api.transport.ConnectionRegistry;
+import org.briarproject.api.plugins.ConnectionRegistry;
 
 import com.google.inject.Inject;
 

briar-core/src/org/briarproject/plugins/PluginManagerImpl.java

@@ -24,6 +24,7 @@ import org.briarproject.api.TransportProperties;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.lifecycle.IoExecutor;
+import org.briarproject.api.plugins.ConnectionDispatcher;
 import org.briarproject.api.plugins.Plugin;
 import org.briarproject.api.plugins.PluginCallback;
 import org.briarproject.api.plugins.PluginManager;
@@ -39,7 +40,6 @@ import org.briarproject.api.plugins.simplex.SimplexPluginCallback;
 import org.briarproject.api.plugins.simplex.SimplexPluginConfig;
 import org.briarproject.api.plugins.simplex.SimplexPluginFactory;
 import org.briarproject.api.system.Clock;
-import org.briarproject.api.transport.ConnectionDispatcher;
 import org.briarproject.api.ui.UiCallback;
 
 // FIXME: Don't make alien calls with a lock held (that includes waiting on a

briar-core/src/org/briarproject/plugins/PluginsModule.java

@@ -3,6 +3,8 @@ package org.briarproject.plugins;
 import javax.inject.Singleton;
 
 import org.briarproject.api.lifecycle.LifecycleManager;
+import org.briarproject.api.plugins.ConnectionDispatcher;
+import org.briarproject.api.plugins.ConnectionRegistry;
 import org.briarproject.api.plugins.PluginManager;
 
 import com.google.inject.AbstractModule;
@@ -13,6 +15,9 @@ public class PluginsModule extends AbstractModule {
 	@Override
 	protected void configure() {
 		bind(Poller.class).to(PollerImpl.class);
+		bind(ConnectionDispatcher.class).to(ConnectionDispatcherImpl.class);
+		bind(ConnectionRegistry.class).to(
+				ConnectionRegistryImpl.class).in(Singleton.class);
 	}
 
 	@Provides @Singleton

briar-core/src/org/briarproject/plugins/PollerImpl.java

@@ -10,9 +10,9 @@ import java.util.logging.Logger;
 import javax.inject.Inject;
 
 import org.briarproject.api.lifecycle.IoExecutor;
+import org.briarproject.api.plugins.ConnectionRegistry;
 import org.briarproject.api.plugins.Plugin;
 import org.briarproject.api.system.Timer;
-import org.briarproject.api.transport.ConnectionRegistry;
 
 class PollerImpl implements Poller {
 

briar-core/src/org/briarproject/transport/TransportModule.java

@@ -4,8 +4,6 @@ import javax.inject.Singleton;
 
 import org.briarproject.api.crypto.KeyManager;
 import org.briarproject.api.lifecycle.LifecycleManager;
-import org.briarproject.api.transport.ConnectionDispatcher;
-import org.briarproject.api.transport.ConnectionRegistry;
 import org.briarproject.api.transport.StreamReaderFactory;
 import org.briarproject.api.transport.StreamWriterFactory;
 import org.briarproject.api.transport.TagRecogniser;
@@ -17,15 +15,10 @@ public class TransportModule extends AbstractModule {
 
 	@Override
 	protected void configure() {
-		bind(ConnectionDispatcher.class).to(ConnectionDispatcherImpl.class);
+		bind(StreamReaderFactory.class).to(StreamReaderFactoryImpl.class);
-		bind(StreamReaderFactory.class).to(
-				StreamReaderFactoryImpl.class);
 		bind(TagRecogniser.class).to(
 				TagRecogniserImpl.class).in(Singleton.class);
-		bind(ConnectionRegistry.class).to(
+		bind(StreamWriterFactory.class).to(StreamWriterFactoryImpl.class);
-				ConnectionRegistryImpl.class).in(Singleton.class);;
-				bind(StreamWriterFactory.class).to(
-						StreamWriterFactoryImpl.class);
 	}
 
 	@Provides @Singleton

briar-tests/build.xml

@@ -113,6 +113,7 @@
 			<test name='org.briarproject.messaging.PacketReaderImplTest'/>
 			<test name='org.briarproject.messaging.SimplexMessagingIntegrationTest'/>
 			<test name='org.briarproject.messaging.SinglePassOutgoingSessionTest'/>
+			<test name='org.briarproject.plugins.ConnectionRegistryImplTest'/>
 			<test name='org.briarproject.plugins.PluginManagerImplTest'/>
 			<test name='org.briarproject.plugins.file.LinuxRemovableDriveFinderTest'/>
 			<test name='org.briarproject.plugins.file.MacRemovableDriveFinderTest'/>
@@ -125,7 +126,6 @@
 			<test name='org.briarproject.serial.ReaderImplTest'/>
 			<test name='org.briarproject.serial.WriterImplTest'/>
 			<test name='org.briarproject.system.LinuxSeedProviderTest'/>
-			<test name='org.briarproject.transport.ConnectionRegistryImplTest'/>
 			<test name='org.briarproject.transport.IncomingEncryptionLayerTest'/>
 			<test name='org.briarproject.transport.KeyManagerImplTest'/>
 			<test name='org.briarproject.transport.KeyRotationIntegrationTest'/>

briar-tests/src/org/briarproject/ProtocolIntegrationTest.java

@@ -7,7 +7,6 @@ import static org.junit.Assert.assertArrayEquals;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -45,7 +44,6 @@ import org.briarproject.crypto.CryptoModule;
 import org.briarproject.db.DatabaseModule;
 import org.briarproject.event.EventModule;
 import org.briarproject.messaging.MessagingModule;
-import org.briarproject.reliability.ReliabilityModule;
 import org.briarproject.serial.SerialModule;
 import org.briarproject.transport.TransportModule;
 import org.junit.Test;
@@ -77,9 +75,8 @@ public class ProtocolIntegrationTest extends BriarTestCase {
 	public ProtocolIntegrationTest() throws Exception {
 		Injector i = Guice.createInjector(new TestDatabaseModule(),
 				new TestLifecycleModule(), new TestSystemModule(),
-				new TestUiModule(), new CryptoModule(), new DatabaseModule(),
+				new CryptoModule(), new DatabaseModule(), new EventModule(),
-				new EventModule(), new MessagingModule(),
+				new MessagingModule(), new SerialModule(),
-				new ReliabilityModule(), new SerialModule(),
 				new TransportModule());
 		streamReaderFactory = i.getInstance(StreamReaderFactory.class);
 		streamWriterFactory = i.getInstance(StreamWriterFactory.class);
@@ -124,9 +121,8 @@ public class ProtocolIntegrationTest extends BriarTestCase {
 				secret.clone(), 0, true);
 		StreamWriter streamWriter = streamWriterFactory.createStreamWriter(out,
 				MAX_FRAME_LENGTH, ctx);
-		OutputStream out1 = streamWriter.getOutputStream();
+		PacketWriter packetWriter = packetWriterFactory.createPacketWriter(
-		PacketWriter packetWriter =
+				streamWriter.getOutputStream());
-				packetWriterFactory.createPacketWriter(out1);
 
 		packetWriter.writeAck(new Ack(messageIds));
 
@@ -144,7 +140,7 @@ public class ProtocolIntegrationTest extends BriarTestCase {
 				transportProperties, 1);
 		packetWriter.writeTransportUpdate(tu);
 
-		out1.flush();
+		streamWriter.getOutputStream().flush();
 		return out.toByteArray();
 	}
 
@@ -157,8 +153,8 @@ public class ProtocolIntegrationTest extends BriarTestCase {
 				secret.clone(), 0, false);
 		StreamReader streamReader = streamReaderFactory.createStreamReader(in,
 				MAX_FRAME_LENGTH, ctx);
-		InputStream in1 = streamReader.getInputStream();
+		PacketReader packetReader = packetReaderFactory.createPacketReader(
-		PacketReader packetReader = packetReaderFactory.createPacketReader(in1);
+				streamReader.getInputStream());
 
 		// Read the ack
 		assertTrue(packetReader.hasAck());

briar-tests/src/org/briarproject/TestUiModule.java

@@ -1,23 +0,0 @@
-package org.briarproject;
-
-import org.briarproject.api.ui.UiCallback;
-
-import com.google.inject.AbstractModule;
-
-public class TestUiModule extends AbstractModule {
-
-	protected void configure() {
-		bind(UiCallback.class).toInstance(new UiCallback() {
-
-			public int showChoice(String[] options, String... message) {
-				return -1;
-			}
-
-			public boolean showConfirmationMessage(String... message) {
-				return false;
-			}
-
-			public void showMessage(String... message) {}			
-		});
-	}
-}

briar-tests/src/org/briarproject/messaging/ConstantsTest.java

@@ -47,7 +47,6 @@ import org.briarproject.crypto.CryptoModule;
 import org.briarproject.db.DatabaseModule;
 import org.briarproject.event.EventModule;
 import org.briarproject.serial.SerialModule;
-import org.briarproject.transport.TransportModule;
 import org.junit.Test;
 
 import com.google.inject.Guice;
@@ -65,8 +64,7 @@ public class ConstantsTest extends BriarTestCase {
 		Injector i = Guice.createInjector(new TestDatabaseModule(),
 				new TestLifecycleModule(), new TestSystemModule(),
 				new CryptoModule(), new DatabaseModule(), new EventModule(),
-				new MessagingModule(), new SerialModule(),
+				new MessagingModule(), new SerialModule());
-				new TransportModule());
 		crypto = i.getInstance(CryptoComponent.class);
 		groupFactory = i.getInstance(GroupFactory.class);
 		authorFactory = i.getInstance(AuthorFactory.class);

briar-tests/src/org/briarproject/messaging/SinglePassOutgoingSessionTest.java

@@ -21,7 +21,6 @@ import org.briarproject.api.messaging.PacketWriterFactory;
 import org.briarproject.crypto.CryptoModule;
 import org.briarproject.event.EventModule;
 import org.briarproject.serial.SerialModule;
-import org.briarproject.transport.TransportModule;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Test;
@@ -58,7 +57,7 @@ public class SinglePassOutgoingSessionTest extends BriarTestCase {
 		Injector i = Guice.createInjector(testModule,
 				new TestLifecycleModule(), new TestSystemModule(),
 				new CryptoModule(), new EventModule(), new MessagingModule(),
-				new SerialModule(), new TransportModule());
+				new SerialModule());
 		packetWriterFactory = i.getInstance(PacketWriterFactory.class);
 		contactId = new ContactId(234);
 		messageId = new MessageId(TestUtils.getRandomId());

briar-tests/src/org/briarproject/plugins/ConnectionRegistryImplTest.java

@@ -1,4 +1,4 @@
-package org.briarproject.transport;
+package org.briarproject.plugins;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -10,7 +10,8 @@ import org.briarproject.api.TransportId;
 import org.briarproject.api.event.ContactConnectedEvent;
 import org.briarproject.api.event.ContactDisconnectedEvent;
 import org.briarproject.api.event.EventBus;
-import org.briarproject.api.transport.ConnectionRegistry;
+import org.briarproject.api.plugins.ConnectionRegistry;
+import org.briarproject.plugins.ConnectionRegistryImpl;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Test;

briar-tests/src/org/briarproject/plugins/PluginManagerImplTest.java

@@ -7,6 +7,7 @@ import java.util.concurrent.Executors;
 import org.briarproject.BriarTestCase;
 import org.briarproject.api.TransportId;
 import org.briarproject.api.db.DatabaseComponent;
+import org.briarproject.api.plugins.ConnectionDispatcher;
 import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
 import org.briarproject.api.plugins.duplex.DuplexPluginConfig;
@@ -16,7 +17,6 @@ import org.briarproject.api.plugins.simplex.SimplexPluginCallback;
 import org.briarproject.api.plugins.simplex.SimplexPluginConfig;
 import org.briarproject.api.plugins.simplex.SimplexPluginFactory;
 import org.briarproject.api.system.Clock;
-import org.briarproject.api.transport.ConnectionDispatcher;
 import org.briarproject.api.ui.UiCallback;
 import org.briarproject.system.SystemClock;
 import org.jmock.Expectations;