Changed the root package from net.sf.briar to org.briarproject.

briar-api/src/net/sf/briar/api/messaging/duplex/DuplexConnectionFactory.java

@@ -1,15 +0,0 @@
-package net.sf.briar.api.messaging.duplex;
-
-import net.sf.briar.api.ContactId;
-import net.sf.briar.api.TransportId;
-import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
-import net.sf.briar.api.transport.ConnectionContext;
-
-public interface DuplexConnectionFactory {
-
-	void createIncomingConnection(ConnectionContext ctx,
-			DuplexTransportConnection d);
-
-	void createOutgoingConnection(ContactId c, TransportId t,
-			DuplexTransportConnection d);
-}

briar-api/src/net/sf/briar/api/messaging/simplex/SimplexConnectionFactory.java

@@ -1,16 +0,0 @@
-package net.sf.briar.api.messaging.simplex;
-
-import net.sf.briar.api.ContactId;
-import net.sf.briar.api.TransportId;
-import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
-import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
-import net.sf.briar.api.transport.ConnectionContext;
-
-public interface SimplexConnectionFactory {
-
-	void createIncomingConnection(ConnectionContext ctx,
-			SimplexTransportReader r);
-
-	void createOutgoingConnection(ContactId c, TransportId t,
-			SimplexTransportWriter w);
-}

briar-api/src/org/briarproject/api/Author.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 /** A pseudonym for a user. */
 public class Author {

briar-api/src/org/briarproject/api/AuthorConstants.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 public interface AuthorConstants {
 

briar-api/src/org/briarproject/api/AuthorFactory.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 public interface AuthorFactory {
 

briar-api/src/org/briarproject/api/AuthorId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 import java.util.Arrays;
 

briar-api/src/org/briarproject/api/Bytes.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 import java.util.Arrays;
 

briar-api/src/org/briarproject/api/Contact.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 public class Contact {
 

briar-api/src/org/briarproject/api/ContactId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 /**
  * Type-safe wrapper for an integer that uniquely identifies a contact within

briar-api/src/org/briarproject/api/FormatException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 import java.io.IOException;
 

briar-api/src/org/briarproject/api/LocalAuthor.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 /** A pseudonym for the local user. */
 public class LocalAuthor extends Author {

briar-api/src/org/briarproject/api/TransportConfig.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 import java.util.Hashtable;
 import java.util.Map;

briar-api/src/org/briarproject/api/TransportId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 import java.util.Arrays;
 

briar-api/src/org/briarproject/api/TransportProperties.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 import java.util.Hashtable;
 import java.util.Map;

briar-api/src/org/briarproject/api/TransportPropertyConstants.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 public interface TransportPropertyConstants {
 

briar-api/src/org/briarproject/api/UniqueId.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api;
+package org.briarproject.api;
 
 import java.util.Arrays;
 

briar-api/src/org/briarproject/api/android/AndroidExecutor.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.android;
+package org.briarproject.api.android;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;

briar-api/src/org/briarproject/api/android/DatabaseUiExecutor.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.android;
+package org.briarproject.api.android;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

briar-api/src/org/briarproject/api/android/ReferenceManager.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.android;
+package org.briarproject.api.android;
 
 /**
  * Manages mappings between object references and serialisable handles. This

briar-api/src/org/briarproject/api/crypto/AuthenticatedCipher.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 import java.security.GeneralSecurityException;
 

briar-api/src/org/briarproject/api/crypto/CryptoComponent.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;

briar-api/src/org/briarproject/api/crypto/CryptoExecutor.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

briar-api/src/org/briarproject/api/crypto/KeyManager.java

@@ -1,10 +1,10 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
-import net.sf.briar.api.ContactId;
-import net.sf.briar.api.TransportId;
-import net.sf.briar.api.lifecycle.Service;
-import net.sf.briar.api.transport.ConnectionContext;
-import net.sf.briar.api.transport.Endpoint;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportId;
+import org.briarproject.api.lifecycle.Service;
+import org.briarproject.api.transport.ConnectionContext;
+import org.briarproject.api.transport.Endpoint;
 
 public interface KeyManager extends Service {
 

briar-api/src/org/briarproject/api/crypto/KeyPair.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 /** A key pair consisting of a {@link PublicKey} and a {@link PrivateKey). */
 public class KeyPair {

briar-api/src/org/briarproject/api/crypto/KeyParser.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 import java.security.GeneralSecurityException;
 

briar-api/src/org/briarproject/api/crypto/MessageDigest.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 public interface MessageDigest {
 

briar-api/src/org/briarproject/api/crypto/PrivateKey.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 /** The private half of a public/private {@link KeyPair}. */
 public interface PrivateKey {

briar-api/src/org/briarproject/api/crypto/PseudoRandom.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 /** A deterministic PRNG. */
 public interface PseudoRandom {

briar-api/src/org/briarproject/api/crypto/PublicKey.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 /** The public half of a public/private {@link KeyPair}. */
 public interface PublicKey {

briar-api/src/org/briarproject/api/crypto/SecretKey.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 /** A secret key used for encryption and/or authentication. */
 public interface SecretKey {

briar-api/src/org/briarproject/api/crypto/Signature.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.crypto;
+package org.briarproject.api.crypto;
 
 import java.security.GeneralSecurityException;
 

briar-api/src/org/briarproject/api/db/ContactExistsException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 /**
  * Thrown when a duplicate contact is added to the database. This exception may

briar-api/src/org/briarproject/api/db/DatabaseComponent.java

@@ -1,34 +1,34 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
 
-import net.sf.briar.api.Author;
-import net.sf.briar.api.AuthorId;
-import net.sf.briar.api.Contact;
-import net.sf.briar.api.ContactId;
-import net.sf.briar.api.LocalAuthor;
-import net.sf.briar.api.TransportConfig;
-import net.sf.briar.api.TransportId;
-import net.sf.briar.api.TransportProperties;
-import net.sf.briar.api.event.EventListener;
-import net.sf.briar.api.messaging.Ack;
-import net.sf.briar.api.messaging.Group;
-import net.sf.briar.api.messaging.GroupId;
-import net.sf.briar.api.messaging.GroupStatus;
-import net.sf.briar.api.messaging.Message;
-import net.sf.briar.api.messaging.MessageId;
-import net.sf.briar.api.messaging.Offer;
-import net.sf.briar.api.messaging.Request;
-import net.sf.briar.api.messaging.RetentionAck;
-import net.sf.briar.api.messaging.RetentionUpdate;
-import net.sf.briar.api.messaging.SubscriptionAck;
-import net.sf.briar.api.messaging.SubscriptionUpdate;
-import net.sf.briar.api.messaging.TransportAck;
-import net.sf.briar.api.messaging.TransportUpdate;
-import net.sf.briar.api.transport.Endpoint;
-import net.sf.briar.api.transport.TemporarySecret;
+import org.briarproject.api.Author;
+import org.briarproject.api.AuthorId;
+import org.briarproject.api.Contact;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.LocalAuthor;
+import org.briarproject.api.TransportConfig;
+import org.briarproject.api.TransportId;
+import org.briarproject.api.TransportProperties;
+import org.briarproject.api.event.EventListener;
+import org.briarproject.api.messaging.Ack;
+import org.briarproject.api.messaging.Group;
+import org.briarproject.api.messaging.GroupId;
+import org.briarproject.api.messaging.GroupStatus;
+import org.briarproject.api.messaging.Message;
+import org.briarproject.api.messaging.MessageId;
+import org.briarproject.api.messaging.Offer;
+import org.briarproject.api.messaging.Request;
+import org.briarproject.api.messaging.RetentionAck;
+import org.briarproject.api.messaging.RetentionUpdate;
+import org.briarproject.api.messaging.SubscriptionAck;
+import org.briarproject.api.messaging.SubscriptionUpdate;
+import org.briarproject.api.messaging.TransportAck;
+import org.briarproject.api.messaging.TransportUpdate;
+import org.briarproject.api.transport.Endpoint;
+import org.briarproject.api.transport.TemporarySecret;
 
 /**
  * Encapsulates the database implementation and exposes high-level operations

briar-api/src/org/briarproject/api/db/DatabaseConfig.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 import java.io.File;
 

briar-api/src/org/briarproject/api/db/DatabaseExecutor.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

briar-api/src/org/briarproject/api/db/DbClosedException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 /** Thrown when a database operation is attempted and the database is closed. */
 public class DbClosedException extends DbException {

briar-api/src/org/briarproject/api/db/DbException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 public class DbException extends Exception {
 

briar-api/src/org/briarproject/api/db/LocalAuthorExistsException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 /**
  * Thrown when a duplicate pseudonym is added to the database. This exception

briar-api/src/org/briarproject/api/db/MessageHeader.java

@@ -1,8 +1,8 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
-import net.sf.briar.api.Author;
-import net.sf.briar.api.messaging.GroupId;
-import net.sf.briar.api.messaging.MessageId;
+import org.briarproject.api.Author;
+import org.briarproject.api.messaging.GroupId;
+import org.briarproject.api.messaging.MessageId;
 
 public class MessageHeader {
 

briar-api/src/org/briarproject/api/db/NoSuchContactException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 /**
  * Thrown when a database operation is attempted for a contact that is not in

briar-api/src/org/briarproject/api/db/NoSuchLocalAuthorException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 /**
  * Thrown when a database operation is attempted for a pseudonym that is not in

briar-api/src/org/briarproject/api/db/NoSuchMessageException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 /**
  * Thrown when a database operation is attempted for a message that is not in

briar-api/src/org/briarproject/api/db/NoSuchSubscriptionException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 /**
  * Thrown when a database operation is attempted for a group to which the user

briar-api/src/org/briarproject/api/db/NoSuchTransportException.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.db;
+package org.briarproject.api.db;
 
 /**
  * Thrown when a database operation is attempted for a transport that is not in

briar-api/src/org/briarproject/api/event/ContactAddedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
+import org.briarproject.api.ContactId;
 
 /** An event that is broadcast when a contact is added. */
 public class ContactAddedEvent extends Event {

briar-api/src/org/briarproject/api/event/ContactRemovedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
+import org.briarproject.api.ContactId;
 
 /** An event that is broadcast when a contact is removed. */
 public class ContactRemovedEvent extends Event {

briar-api/src/org/briarproject/api/event/Event.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
 /** An abstract superclass for events. */
 public abstract class Event {

briar-api/src/org/briarproject/api/event/EventListener.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
 /** An interface for receiving notifications when events occur. */
 public interface EventListener {

briar-api/src/org/briarproject/api/event/LocalAuthorAddedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.AuthorId;
+import org.briarproject.api.AuthorId;
 
 /** An event that is broadcast when a local pseudonym is added. */
 public class LocalAuthorAddedEvent extends Event {

briar-api/src/org/briarproject/api/event/LocalAuthorRemovedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.AuthorId;
+import org.briarproject.api.AuthorId;
 
 /** An event that is broadcast when a local pseudonym is removed. */
 public class LocalAuthorRemovedEvent extends Event {

briar-api/src/org/briarproject/api/event/LocalSubscriptionsUpdatedEvent.java

@@ -1,8 +1,8 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
 import java.util.Collection;
 
-import net.sf.briar.api.ContactId;
+import org.briarproject.api.ContactId;
 
 /**
  * An event that is broadcast when the set of subscriptions visible to one or

briar-api/src/org/briarproject/api/event/LocalTransportsUpdatedEvent.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
 /**
  * An event that is broadcast when the local transport properties are

briar-api/src/org/briarproject/api/event/MessageAddedEvent.java

@@ -1,7 +1,7 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
-import net.sf.briar.api.messaging.Group;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.messaging.Group;
 
 /** An event that is broadcast when a message is added to the database. */
 public class MessageAddedEvent extends Event {

briar-api/src/org/briarproject/api/event/MessageExpiredEvent.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
 /**
  * An event that is broadcast when one or messages expire from the database,

briar-api/src/org/briarproject/api/event/MessageRequestedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
+import org.briarproject.api.ContactId;
 
 /** An event that is broadcast when a message is requested by a contact. */
 public class MessageRequestedEvent extends Event {

briar-api/src/org/briarproject/api/event/MessageToAckEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
+import org.briarproject.api.ContactId;
 
 /**
  * An event that is broadcast when a message is received from or offered by a

briar-api/src/org/briarproject/api/event/MessageToRequestEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
+import org.briarproject.api.ContactId;
 
 /**
  * An event that is broadcast when a message is offered by a contact and needs

briar-api/src/org/briarproject/api/event/RemoteRetentionTimeUpdatedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
+import org.briarproject.api.ContactId;
 
 /**
  * An event that is broadcast when the retention time of a contact's database

briar-api/src/org/briarproject/api/event/RemoteSubscriptionsUpdatedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
+import org.briarproject.api.ContactId;
 
 /**  An event that is broadcast when a contact's subscriptions are updated. */
 public class RemoteSubscriptionsUpdatedEvent extends Event {

briar-api/src/org/briarproject/api/event/RemoteTransportsUpdatedEvent.java

@@ -1,7 +1,7 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.ContactId;
-import net.sf.briar.api.TransportId;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportId;
 
 /**
  * An event that is broadcast when a contact's remote transport properties

briar-api/src/org/briarproject/api/event/SubscriptionAddedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.messaging.Group;
+import org.briarproject.api.messaging.Group;
 
 /** An event that is broadcast when the user subscribes to a group. */
 public class SubscriptionAddedEvent extends Event {

briar-api/src/org/briarproject/api/event/SubscriptionRemovedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.messaging.Group;
+import org.briarproject.api.messaging.Group;
 
 /** An event that is broadcast when the user unsubscribes from a group. */
 public class SubscriptionRemovedEvent extends Event {

briar-api/src/org/briarproject/api/event/TransportAddedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.TransportId;
+import org.briarproject.api.TransportId;
 
 /** An event that is broadcast when a transport is added. */
 public class TransportAddedEvent extends Event {

briar-api/src/org/briarproject/api/event/TransportRemovedEvent.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.event;
+package org.briarproject.api.event;
 
-import net.sf.briar.api.TransportId;
+import org.briarproject.api.TransportId;
 
 /** An event that is broadcast when a transport is removed. */
 public class TransportRemovedEvent extends Event {

briar-api/src/org/briarproject/api/invitation/InvitationConstants.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.invitation;
+package org.briarproject.api.invitation;
 
 public interface InvitationConstants {
 

briar-api/src/org/briarproject/api/invitation/InvitationListener.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.invitation;
+package org.briarproject.api.invitation;
 
 /**
  * An interface for receiving updates about the state of an

briar-api/src/org/briarproject/api/invitation/InvitationState.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.invitation;
+package org.briarproject.api.invitation;
 
 public class InvitationState {
 

briar-api/src/org/briarproject/api/invitation/InvitationTask.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.invitation;
+package org.briarproject.api.invitation;
 
 /** A task for exchanging invitations with a remote peer. */
 public interface InvitationTask {

briar-api/src/org/briarproject/api/invitation/InvitationTaskFactory.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.invitation;
+package org.briarproject.api.invitation;
 
-import net.sf.briar.api.AuthorId;
+import org.briarproject.api.AuthorId;
 
 /** Creates tasks for exchanging invitations with remote peers. */
 public interface InvitationTaskFactory {

briar-api/src/org/briarproject/api/lifecycle/LifecycleManager.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.lifecycle;
+package org.briarproject.api.lifecycle;
 
 import java.util.concurrent.ExecutorService;
 

briar-api/src/org/briarproject/api/lifecycle/Service.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.lifecycle;
+package org.briarproject.api.lifecycle;
 
 public interface Service {
 

briar-api/src/org/briarproject/api/lifecycle/ShutdownManager.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.lifecycle;
+package org.briarproject.api.lifecycle;
 
 public interface ShutdownManager {
 

briar-api/src/org/briarproject/api/messaging/Ack.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.util.Collection;
 

briar-api/src/org/briarproject/api/messaging/Group.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 /** A group to which users may subscribe. */
 public class Group {

briar-api/src/org/briarproject/api/messaging/GroupFactory.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 public interface GroupFactory {
 

briar-api/src/org/briarproject/api/messaging/GroupId.java

@@ -1,8 +1,8 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.util.Arrays;
 
-import net.sf.briar.api.UniqueId;
+import org.briarproject.api.UniqueId;
 
 /**
  * Type-safe wrapper for a byte array that uniquely identifies a {@link Group}.

briar-api/src/org/briarproject/api/messaging/GroupStatus.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 public class GroupStatus {
 

briar-api/src/org/briarproject/api/messaging/Message.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
-import net.sf.briar.api.Author;
+import org.briarproject.api.Author;
 
 public interface Message {
 
@@ -20,7 +20,7 @@ public interface Message {
 	Group getGroup();
 
 	/**
-	 * Returns the message's {@link net.sf.briar.api.Author Author}, or null
+	 * Returns the message's {@link org.briarproject.api.Author Author}, or null
 	 * if this is an anonymous message.
 	 */
 	Author getAuthor();

briar-api/src/org/briarproject/api/messaging/MessageFactory.java

@@ -1,10 +1,10 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
-import net.sf.briar.api.Author;
-import net.sf.briar.api.crypto.PrivateKey;
+import org.briarproject.api.Author;
+import org.briarproject.api.crypto.PrivateKey;
 
 public interface MessageFactory {
 

briar-api/src/org/briarproject/api/messaging/MessageId.java

@@ -1,8 +1,8 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.util.Arrays;
 
-import net.sf.briar.api.UniqueId;
+import org.briarproject.api.UniqueId;
 
 /**
  * Type-safe wrapper for a byte array that uniquely identifies a

briar-api/src/org/briarproject/api/messaging/MessageVerifier.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.security.GeneralSecurityException;
 

briar-api/src/org/briarproject/api/messaging/MessagingConstants.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
-import static net.sf.briar.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;
+import static org.briarproject.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;
 
 public interface MessagingConstants {
 

briar-api/src/org/briarproject/api/messaging/Offer.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.util.Collection;
 

briar-api/src/org/briarproject/api/messaging/PacketReader.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.io.IOException;
 

briar-api/src/org/briarproject/api/messaging/PacketReaderFactory.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.io.InputStream;
 

briar-api/src/org/briarproject/api/messaging/PacketWriter.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.io.IOException;
 

briar-api/src/org/briarproject/api/messaging/PacketWriterFactory.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.io.OutputStream;
 

briar-api/src/org/briarproject/api/messaging/Request.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.util.Collection;
 

briar-api/src/org/briarproject/api/messaging/RetentionAck.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 /** A packet acknowledging a (@link RetentionUpdate} */
 public class RetentionAck {

briar-api/src/org/briarproject/api/messaging/RetentionUpdate.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 /**
  * A packet updating the recipient's view of the retention time of the sender's

briar-api/src/org/briarproject/api/messaging/SubscriptionAck.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 /** A packet acknowledging a {@link SubscriptionUpdate}. */
 public class SubscriptionAck {

briar-api/src/org/briarproject/api/messaging/SubscriptionUpdate.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 import java.util.Collection;
 

briar-api/src/org/briarproject/api/messaging/TransportAck.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
-import net.sf.briar.api.TransportId;
+import org.briarproject.api.TransportId;
 
 /** A packet acknowledging a {@link TransportUpdate}. */
 public class TransportAck {

briar-api/src/org/briarproject/api/messaging/TransportUpdate.java

@@ -1,7 +1,7 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
-import net.sf.briar.api.TransportId;
-import net.sf.briar.api.TransportProperties;
+import org.briarproject.api.TransportId;
+import org.briarproject.api.TransportProperties;
 
 /**
  * A packet updating the recipient's view of the sender's transport properties.

briar-api/src/org/briarproject/api/messaging/Types.java

@@ -1,4 +1,4 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
 /** Struct identifiers for encoding and decoding protocol objects. */
 public interface Types {

briar-api/src/org/briarproject/api/messaging/UnverifiedMessage.java

@@ -1,6 +1,6 @@
-package net.sf.briar.api.messaging;
+package org.briarproject.api.messaging;
 
-import net.sf.briar.api.Author;
+import org.briarproject.api.Author;
 
 /** A {@link Message} that has not yet had its signatures (if any) verified. */
 public class UnverifiedMessage {
@@ -45,7 +45,7 @@ public class UnverifiedMessage {
 	}
 
 	/**
-	 * Returns the message's {@link net.sf.briar.api.Author Author}, or null
+	 * Returns the message's {@link org.briarproject.api.Author Author}, or null
 	 * if this is an anonymous message.
 	 */
 	public Author getAuthor() {

briar-api/src/org/briarproject/api/messaging/duplex/DuplexConnectionFactory.java

@@ -0,0 +1,15 @@
+package org.briarproject.api.messaging.duplex;
+
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportId;
+import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import org.briarproject.api.transport.ConnectionContext;
+
+public interface DuplexConnectionFactory {
+
+	void createIncomingConnection(ConnectionContext ctx,
+			DuplexTransportConnection d);
+
+	void createOutgoingConnection(ContactId c, TransportId t,
+			DuplexTransportConnection d);
+}

briar-api/src/org/briarproject/api/messaging/simplex/SimplexConnectionFactory.java

@@ -0,0 +1,16 @@
+package org.briarproject.api.messaging.simplex;
+
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportId;
+import org.briarproject.api.plugins.simplex.SimplexTransportReader;
+import org.briarproject.api.plugins.simplex.SimplexTransportWriter;
+import org.briarproject.api.transport.ConnectionContext;
+
+public interface SimplexConnectionFactory {
+
+	void createIncomingConnection(ConnectionContext ctx,
+			SimplexTransportReader r);
+
+	void createOutgoingConnection(ContactId c, TransportId t,
+			SimplexTransportWriter w);
+}

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

@@ -1,10 +1,10 @@
-package net.sf.briar.api.plugins;
+package org.briarproject.api.plugins;
 
 import java.io.IOException;
 import java.util.Collection;
 
-import net.sf.briar.api.ContactId;
-import net.sf.briar.api.TransportId;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportId;
 
 public interface Plugin {
 

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

@@ -1,10 +1,10 @@
-package net.sf.briar.api.plugins;
+package org.briarproject.api.plugins;
 
 import java.util.Map;
 
-import net.sf.briar.api.ContactId;
-import net.sf.briar.api.TransportConfig;
-import net.sf.briar.api.TransportProperties;
+import org.briarproject.api.ContactId;
+import org.briarproject.api.TransportConfig;
+import org.briarproject.api.TransportProperties;
 
 /**
  * An interface through which a transport plugin interacts with the rest of