Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
akwizgran
2014-01-08 16:18:30 +00:00
parent dce70f487c
commit 832476412c
427 changed files with 2507 additions and 2507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-core/src/net/sf/briar/system/ClockModule.java
View File

@@ -1,16 +0,0 @@
package net.sf.briar.system;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import net.sf.briar.api.system.SystemTimer;
import net.sf.briar.api.system.Timer;
import com.google.inject.AbstractModule;
public class ClockModule extends AbstractModule {
protected void configure() {
bind(Clock.class).to(SystemClock.class);
bind(Timer.class).to(SystemTimer.class);
}
}

6
briar-core/src/net/sf/briar/crypto/AuthenticatedCipherImpl.java → briar-core/src/org/briarproject/crypto/AuthenticatedCipherImpl.java
View File

@@ -1,11 +1,11 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import java.security.GeneralSecurityException;
import javax.crypto.Cipher;
import net.sf.briar.api.crypto.AuthenticatedCipher;
import net.sf.briar.api.crypto.SecretKey;
import org.briarproject.api.crypto.AuthenticatedCipher;
import org.briarproject.api.crypto.SecretKey;
import org.spongycastle.crypto.DataLengthException;
import org.spongycastle.crypto.InvalidCipherTextException;

34
briar-core/src/net/sf/briar/crypto/CryptoComponentImpl.java → briar-core/src/org/briarproject/crypto/CryptoComponentImpl.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import static java.util.logging.Level.INFO;
import static javax.crypto.Cipher.DECRYPT_MODE;
import static javax.crypto.Cipher.ENCRYPT_MODE;
import static net.sf.briar.api.invitation.InvitationConstants.CODE_BITS;
import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
import static net.sf.briar.crypto.EllipticCurveConstants.P;
import static net.sf.briar.crypto.EllipticCurveConstants.PARAMETERS;
import static net.sf.briar.util.ByteUtils.MAX_32_BIT_UNSIGNED;
import static org.briarproject.api.invitation.InvitationConstants.CODE_BITS;
import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
import static org.briarproject.crypto.EllipticCurveConstants.P;
import static org.briarproject.crypto.EllipticCurveConstants.PARAMETERS;
import static org.briarproject.util.ByteUtils.MAX_32_BIT_UNSIGNED;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -19,17 +19,17 @@ import java.util.Collections;
import java.util.List;
import java.util.logging.Logger;
import net.sf.briar.api.crypto.AuthenticatedCipher;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyPair;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.crypto.PrivateKey;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.crypto.PublicKey;
import net.sf.briar.api.crypto.SecretKey;
import net.sf.briar.api.crypto.Signature;
import net.sf.briar.util.ByteUtils;
import org.briarproject.api.crypto.AuthenticatedCipher;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyPair;
import org.briarproject.api.crypto.KeyParser;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.crypto.PrivateKey;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.crypto.PublicKey;
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.api.crypto.Signature;
import org.briarproject.util.ByteUtils;
import org.spongycastle.crypto.AsymmetricCipherKeyPair;
import org.spongycastle.crypto.BlockCipher;

8
briar-core/src/net/sf/briar/crypto/CryptoModule.java → briar-core/src/org/briarproject/crypto/CryptoModule.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -11,9 +11,9 @@ import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.lifecycle.LifecycleManager;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.lifecycle.LifecycleManager;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

4
briar-core/src/net/sf/briar/crypto/DoubleDigest.java → briar-core/src/org/briarproject/crypto/DoubleDigest.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import net.sf.briar.api.crypto.MessageDigest;
import org.briarproject.api.crypto.MessageDigest;
import org.spongycastle.crypto.Digest;

2
briar-core/src/net/sf/briar/crypto/EllipticCurveConstants.java → briar-core/src/org/briarproject/crypto/EllipticCurveConstants.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import java.math.BigInteger;

8
briar-core/src/net/sf/briar/crypto/PseudoRandomImpl.java → briar-core/src/org/briarproject/crypto/PseudoRandomImpl.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.util.ByteUtils;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.util.ByteUtils;
class PseudoRandomImpl implements PseudoRandom {

8
briar-core/src/net/sf/briar/crypto/Sec1KeyParser.java → briar-core/src/org/briarproject/crypto/Sec1KeyParser.java
View File

@@ -1,11 +1,11 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import java.math.BigInteger;
import java.security.GeneralSecurityException;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.crypto.PrivateKey;
import net.sf.briar.api.crypto.PublicKey;
import org.briarproject.api.crypto.KeyParser;
import org.briarproject.api.crypto.PrivateKey;
import org.briarproject.api.crypto.PublicKey;
import org.spongycastle.crypto.params.ECDomainParameters;
import org.spongycastle.crypto.params.ECPrivateKeyParameters;

4
briar-core/src/net/sf/briar/crypto/Sec1PrivateKey.java → briar-core/src/org/briarproject/crypto/Sec1PrivateKey.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import net.sf.briar.api.crypto.PrivateKey;
import org.briarproject.api.crypto.PrivateKey;
import org.spongycastle.crypto.params.ECPrivateKeyParameters;

4
briar-core/src/net/sf/briar/crypto/Sec1PublicKey.java → briar-core/src/org/briarproject/crypto/Sec1PublicKey.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import net.sf.briar.api.crypto.PublicKey;
import org.briarproject.api.crypto.PublicKey;
import org.spongycastle.crypto.params.ECPublicKeyParameters;

2
briar-core/src/net/sf/briar/crypto/Sec1Utils.java → briar-core/src/org/briarproject/crypto/Sec1Utils.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
class Sec1Utils {

6
briar-core/src/net/sf/briar/crypto/SecretKeyImpl.java → briar-core/src/org/briarproject/crypto/SecretKeyImpl.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import net.sf.briar.api.crypto.SecretKey;
import net.sf.briar.util.ByteUtils;
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.util.ByteUtils;
class SecretKeyImpl implements SecretKey {

8
briar-core/src/net/sf/briar/crypto/SignatureImpl.java → briar-core/src/org/briarproject/crypto/SignatureImpl.java
View File

@@ -1,11 +1,11 @@
package net.sf.briar.crypto;
package org.briarproject.crypto;
import java.security.GeneralSecurityException;
import java.security.SecureRandom;
import net.sf.briar.api.crypto.PrivateKey;
import net.sf.briar.api.crypto.PublicKey;
import net.sf.briar.api.crypto.Signature;
import org.briarproject.api.crypto.PrivateKey;
import org.briarproject.api.crypto.PublicKey;
import org.briarproject.api.crypto.Signature;
import org.spongycastle.crypto.digests.SHA384Digest;
import org.spongycastle.crypto.params.ECPrivateKeyParameters;

48
briar-core/src/net/sf/briar/db/Database.java → briar-core/src/org/briarproject/db/Database.java
View File

@@ -1,32 +1,32 @@
package net.sf.briar.db;
package org.briarproject.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.db.DbException;
import net.sf.briar.api.db.MessageHeader;
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.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.db.DbException;
import org.briarproject.api.db.MessageHeader;
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.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;
// FIXME: Document the preconditions for calling each method

4
briar-core/src/net/sf/briar/db/DatabaseCleaner.java → briar-core/src/org/briarproject/db/DatabaseCleaner.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.db;
package org.briarproject.db;
import net.sf.briar.api.db.DbException;
import org.briarproject.api.db.DbException;
interface DatabaseCleaner {

8
briar-core/src/net/sf/briar/db/DatabaseCleanerImpl.java → briar-core/src/org/briarproject/db/DatabaseCleanerImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.db;
package org.briarproject.db;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -8,9 +8,9 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.db.DbClosedException;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.system.Timer;
import org.briarproject.api.db.DbClosedException;
import org.briarproject.api.db.DbException;
import org.briarproject.api.system.Timer;
class DatabaseCleanerImpl extends TimerTask implements DatabaseCleaner {

126
briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java → briar-core/src/org/briarproject/db/DatabaseComponentImpl.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.db;
package org.briarproject.db;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.db.DatabaseConstants.BYTES_PER_SWEEP;
import static net.sf.briar.db.DatabaseConstants.CRITICAL_FREE_SPACE;
import static net.sf.briar.db.DatabaseConstants.MAX_BYTES_BETWEEN_SPACE_CHECKS;
import static net.sf.briar.db.DatabaseConstants.MAX_MS_BETWEEN_SPACE_CHECKS;
import static net.sf.briar.db.DatabaseConstants.MAX_OFFERED_MESSAGES;
import static net.sf.briar.db.DatabaseConstants.MIN_FREE_SPACE;
import static org.briarproject.db.DatabaseConstants.BYTES_PER_SWEEP;
import static org.briarproject.db.DatabaseConstants.CRITICAL_FREE_SPACE;
import static org.briarproject.db.DatabaseConstants.MAX_BYTES_BETWEEN_SPACE_CHECKS;
import static org.briarproject.db.DatabaseConstants.MAX_MS_BETWEEN_SPACE_CHECKS;
import static org.briarproject.db.DatabaseConstants.MAX_OFFERED_MESSAGES;
import static org.briarproject.db.DatabaseConstants.MIN_FREE_SPACE;
import java.io.IOException;
import java.util.ArrayList;
@@ -22,62 +22,62 @@ import java.util.logging.Logger;
import javax.inject.Inject;
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.db.ContactExistsException;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.LocalAuthorExistsException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.db.NoSuchLocalAuthorException;
import net.sf.briar.api.db.NoSuchMessageException;
import net.sf.briar.api.db.NoSuchSubscriptionException;
import net.sf.briar.api.db.NoSuchTransportException;
import net.sf.briar.api.event.ContactAddedEvent;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.LocalAuthorAddedEvent;
import net.sf.briar.api.event.LocalAuthorRemovedEvent;
import net.sf.briar.api.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.LocalTransportsUpdatedEvent;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.event.MessageRequestedEvent;
import net.sf.briar.api.event.MessageToAckEvent;
import net.sf.briar.api.event.MessageToRequestEvent;
import net.sf.briar.api.event.RemoteRetentionTimeUpdatedEvent;
import net.sf.briar.api.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.RemoteTransportsUpdatedEvent;
import net.sf.briar.api.event.SubscriptionAddedEvent;
import net.sf.briar.api.event.SubscriptionRemovedEvent;
import net.sf.briar.api.event.TransportAddedEvent;
import net.sf.briar.api.event.TransportRemovedEvent;
import net.sf.briar.api.lifecycle.ShutdownManager;
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.system.Clock;
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.db.ContactExistsException;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.LocalAuthorExistsException;
import org.briarproject.api.db.MessageHeader;
import org.briarproject.api.db.NoSuchContactException;
import org.briarproject.api.db.NoSuchLocalAuthorException;
import org.briarproject.api.db.NoSuchMessageException;
import org.briarproject.api.db.NoSuchSubscriptionException;
import org.briarproject.api.db.NoSuchTransportException;
import org.briarproject.api.event.ContactAddedEvent;
import org.briarproject.api.event.ContactRemovedEvent;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.LocalAuthorAddedEvent;
import org.briarproject.api.event.LocalAuthorRemovedEvent;
import org.briarproject.api.event.LocalSubscriptionsUpdatedEvent;
import org.briarproject.api.event.LocalTransportsUpdatedEvent;
import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.event.MessageRequestedEvent;
import org.briarproject.api.event.MessageToAckEvent;
import org.briarproject.api.event.MessageToRequestEvent;
import org.briarproject.api.event.RemoteRetentionTimeUpdatedEvent;
import org.briarproject.api.event.RemoteSubscriptionsUpdatedEvent;
import org.briarproject.api.event.RemoteTransportsUpdatedEvent;
import org.briarproject.api.event.SubscriptionAddedEvent;
import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.event.TransportAddedEvent;
import org.briarproject.api.event.TransportRemovedEvent;
import org.briarproject.api.lifecycle.ShutdownManager;
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.system.Clock;
import org.briarproject.api.transport.Endpoint;
import org.briarproject.api.transport.TemporarySecret;
/**
* An implementation of DatabaseComponent using reentrant read-write locks.

2
briar-core/src/net/sf/briar/db/DatabaseConstants.java → briar-core/src/org/briarproject/db/DatabaseConstants.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.db;
package org.briarproject.db;
interface DatabaseConstants {

18
briar-core/src/net/sf/briar/db/DatabaseModule.java → briar-core/src/org/briarproject/db/DatabaseModule.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.db;
package org.briarproject.db;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -12,14 +12,14 @@ import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.api.system.SystemClock;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.db.DatabaseExecutor;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.lifecycle.ShutdownManager;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.FileUtils;
import org.briarproject.api.system.SystemClock;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

2
briar-core/src/net/sf/briar/db/DbStateException.java → briar-core/src/org/briarproject/db/DbStateException.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.db;
package org.briarproject.db;
import java.sql.SQLException;

2
briar-core/src/net/sf/briar/db/ExponentialBackoff.java → briar-core/src/org/briarproject/db/ExponentialBackoff.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.db;
package org.briarproject.db;
class ExponentialBackoff {

12
briar-core/src/net/sf/briar/db/H2Database.java → briar-core/src/org/briarproject/db/H2Database.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.db;
package org.briarproject.db;
import java.io.File;
import java.io.IOException;
@@ -10,11 +10,11 @@ import java.util.Properties;
import javax.inject.Inject;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.FileUtils;
import net.sf.briar.util.StringUtils;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.db.DbException;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.FileUtils;
import org.briarproject.util.StringUtils;
/** Contains all the H2-specific code for the database. */
class H2Database extends JdbcDatabase {

58
briar-core/src/net/sf/briar/db/JdbcDatabase.java → briar-core/src/org/briarproject/db/JdbcDatabase.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.db;
package org.briarproject.db;
import static java.sql.Types.BINARY;
import static java.sql.Types.VARCHAR;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
import static net.sf.briar.api.messaging.MessagingConstants.RETENTION_GRANULARITY;
import static net.sf.briar.db.ExponentialBackoff.calculateExpiry;
import static org.briarproject.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
import static org.briarproject.api.messaging.MessagingConstants.RETENTION_GRANULARITY;
import static org.briarproject.db.ExponentialBackoff.calculateExpiry;
import java.io.IOException;
import java.sql.Connection;
@@ -24,31 +24,31 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Logger;
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.db.DbClosedException;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
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.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.system.Clock;
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.db.DbClosedException;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.MessageHeader;
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.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.system.Clock;
import org.briarproject.api.transport.Endpoint;
import org.briarproject.api.transport.TemporarySecret;
/**
* A generic database implementation that can be used with any JDBC-compatible

48
briar-core/src/net/sf/briar/invitation/AliceConnector.java → briar-core/src/org/briarproject/invitation/AliceConnector.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.invitation;
package org.briarproject.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -10,29 +10,29 @@ import java.security.GeneralSecurityException;
import java.util.Map;
import java.util.logging.Logger;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
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.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
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.ConnectionReader;
import org.briarproject.api.transport.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionWriter;
import org.briarproject.api.transport.ConnectionWriterFactory;
/** A connection thread for the peer being Alice in the invitation protocol. */
class AliceConnector extends Connector {

48
briar-core/src/net/sf/briar/invitation/BobConnector.java → briar-core/src/org/briarproject/invitation/BobConnector.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.invitation;
package org.briarproject.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -10,29 +10,29 @@ import java.security.GeneralSecurityException;
import java.util.Map;
import java.util.logging.Logger;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
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.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
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.ConnectionReader;
import org.briarproject.api.transport.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionWriter;
import org.briarproject.api.transport.ConnectionWriterFactory;
/** A connection thread for the peer being Bob in the invitation protocol. */
class BobConnector extends Connector {

80
briar-core/src/net/sf/briar/invitation/Connector.java → briar-core/src/org/briarproject/invitation/Connector.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.invitation;
package org.briarproject.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import static net.sf.briar.api.invitation.InvitationConstants.HASH_LENGTH;
import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static org.briarproject.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
import static org.briarproject.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import static org.briarproject.api.invitation.InvitationConstants.HASH_LENGTH;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -21,39 +21,39 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Logger;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorConstants;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.UniqueId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.KeyPair;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.crypto.Signature;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchTransportException;
import net.sf.briar.api.invitation.InvitationConstants;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.api.transport.Endpoint;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorConstants;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.ContactId;
import org.briarproject.api.FormatException;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.UniqueId;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
import org.briarproject.api.crypto.KeyPair;
import org.briarproject.api.crypto.KeyParser;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.crypto.Signature;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
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.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
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.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionWriterFactory;
import org.briarproject.api.transport.Endpoint;
abstract class Connector extends Thread {

50
briar-core/src/net/sf/briar/invitation/ConnectorGroup.java → briar-core/src/org/briarproject/invitation/ConnectorGroup.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.invitation;
package org.briarproject.invitation;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.invitation.InvitationConstants.CONFIRMATION_TIMEOUT;
import static org.briarproject.api.invitation.InvitationConstants.CONFIRMATION_TIMEOUT;
import java.util.ArrayList;
import java.util.Collection;
@@ -12,29 +12,29 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.invitation.InvitationListener;
import net.sf.briar.api.invitation.InvitationState;
import net.sf.briar.api.invitation.InvitationTask;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.plugins.PluginManager;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.AuthorId;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
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.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.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionWriterFactory;
/** A task consisting of one or more parallel connection attempts. */
class ConnectorGroup extends Thread implements InvitationTask {

4
briar-core/src/net/sf/briar/invitation/InvitationModule.java → briar-core/src/org/briarproject/invitation/InvitationModule.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.invitation;
package org.briarproject.invitation;
import javax.inject.Singleton;
import net.sf.briar.api.invitation.InvitationTaskFactory;
import org.briarproject.api.invitation.InvitationTaskFactory;
import com.google.inject.AbstractModule;

32
briar-core/src/net/sf/briar/invitation/InvitationTaskFactoryImpl.java → briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java
View File

@@ -1,22 +1,22 @@
package net.sf.briar.invitation;
package org.briarproject.invitation;
import javax.inject.Inject;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.invitation.InvitationTask;
import net.sf.briar.api.invitation.InvitationTaskFactory;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.plugins.PluginManager;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.WriterFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.AuthorId;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
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.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.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionWriterFactory;
class InvitationTaskFactoryImpl implements InvitationTaskFactory {

10
briar-core/src/net/sf/briar/lifecycle/LifecycleManagerImpl.java → briar-core/src/org/briarproject/lifecycle/LifecycleManagerImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.lifecycle;
package org.briarproject.lifecycle;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -12,10 +12,10 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.lifecycle.Service;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.lifecycle.Service;
class LifecycleManagerImpl implements LifecycleManager {

6
briar-core/src/net/sf/briar/lifecycle/LifecycleModule.java → briar-core/src/org/briarproject/lifecycle/LifecycleModule.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.lifecycle;
package org.briarproject.lifecycle;
import javax.inject.Singleton;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.lifecycle.ShutdownManager;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.lifecycle.ShutdownManager;
import com.google.inject.AbstractModule;

4
briar-core/src/net/sf/briar/lifecycle/ShutdownManagerImpl.java → briar-core/src/org/briarproject/lifecycle/ShutdownManagerImpl.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.lifecycle;
package org.briarproject.lifecycle;
import java.util.HashMap;
import java.util.Map;
import net.sf.briar.api.lifecycle.ShutdownManager;
import org.briarproject.api.lifecycle.ShutdownManager;
class ShutdownManagerImpl implements ShutdownManager {

20
briar-core/src/net/sf/briar/messaging/AuthorFactoryImpl.java → briar-core/src/org/briarproject/messaging/AuthorFactoryImpl.java
View File

@@ -1,20 +1,20 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.messaging.Types.AUTHOR;
import static org.briarproject.api.messaging.Types.AUTHOR;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import javax.inject.Inject;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.LocalAuthor;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.AuthorId;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
class AuthorFactoryImpl implements AuthorFactory {

22
briar-core/src/net/sf/briar/messaging/AuthorReader.java → briar-core/src/org/briarproject/messaging/AuthorReader.java
View File

@@ -1,18 +1,18 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.Types.AUTHOR;
import static org.briarproject.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
import static org.briarproject.api.messaging.Types.AUTHOR;
import java.io.IOException;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.serial.DigestingConsumer;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.StructReader;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorId;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.serial.DigestingConsumer;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.StructReader;
class AuthorReader implements StructReader<Author> {

20
briar-core/src/net/sf/briar/messaging/GroupFactoryImpl.java → briar-core/src/org/briarproject/messaging/GroupFactoryImpl.java
View File

@@ -1,20 +1,20 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
import static net.sf.briar.api.messaging.Types.GROUP;
import static org.briarproject.api.messaging.MessagingConstants.GROUP_SALT_LENGTH;
import static org.briarproject.api.messaging.Types.GROUP;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import javax.inject.Inject;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
class GroupFactoryImpl implements GroupFactory {

22
briar-core/src/net/sf/briar/messaging/GroupReader.java → briar-core/src/org/briarproject/messaging/GroupReader.java
View File

@@ -1,18 +1,18 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
import static net.sf.briar.api.messaging.Types.GROUP;
import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
import static org.briarproject.api.messaging.Types.GROUP;
import java.io.IOException;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.serial.DigestingConsumer;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.StructReader;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.serial.DigestingConsumer;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.StructReader;
class GroupReader implements StructReader<Group> {

48
briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java → briar-core/src/org/briarproject/messaging/MessageFactoryImpl.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MESSAGE_SALT_LENGTH;
import static net.sf.briar.api.messaging.Types.AUTHOR;
import static net.sf.briar.api.messaging.Types.GROUP;
import static net.sf.briar.api.messaging.Types.MESSAGE;
import static org.briarproject.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MESSAGE_SALT_LENGTH;
import static org.briarproject.api.messaging.Types.AUTHOR;
import static org.briarproject.api.messaging.Types.GROUP;
import static org.briarproject.api.messaging.Types.MESSAGE;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -16,21 +16,21 @@ import java.security.SecureRandom;
import javax.inject.Inject;
import net.sf.briar.api.Author;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.crypto.PrivateKey;
import net.sf.briar.api.crypto.Signature;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageFactory;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.CountingConsumer;
import net.sf.briar.api.serial.DigestingConsumer;
import net.sf.briar.api.serial.SigningConsumer;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import org.briarproject.api.Author;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.crypto.PrivateKey;
import org.briarproject.api.crypto.Signature;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageFactory;
import org.briarproject.api.messaging.MessageId;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.CountingConsumer;
import org.briarproject.api.serial.DigestingConsumer;
import org.briarproject.api.serial.SigningConsumer;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
class MessageFactoryImpl implements MessageFactory {

12
briar-core/src/net/sf/briar/messaging/MessageImpl.java → briar-core/src/org/briarproject/messaging/MessageImpl.java
View File

@@ -1,10 +1,10 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import net.sf.briar.api.Author;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
import static org.briarproject.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import org.briarproject.api.Author;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageId;
/** A simple in-memory implementation of a message. */
class MessageImpl implements Message {

34
briar-core/src/net/sf/briar/messaging/MessageReader.java → briar-core/src/org/briarproject/messaging/MessageReader.java
View File

@@ -1,24 +1,24 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MESSAGE_SALT_LENGTH;
import static net.sf.briar.api.messaging.Types.MESSAGE;
import static org.briarproject.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MESSAGE_SALT_LENGTH;
import static org.briarproject.api.messaging.Types.MESSAGE;
import java.io.IOException;
import net.sf.briar.api.Author;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.UniqueId;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.serial.CopyingConsumer;
import net.sf.briar.api.serial.CountingConsumer;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.StructReader;
import org.briarproject.api.Author;
import org.briarproject.api.FormatException;
import org.briarproject.api.UniqueId;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.MessageId;
import org.briarproject.api.messaging.UnverifiedMessage;
import org.briarproject.api.serial.CopyingConsumer;
import org.briarproject.api.serial.CountingConsumer;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.StructReader;
class MessageReader implements StructReader<UnverifiedMessage> {

26
briar-core/src/net/sf/briar/messaging/MessageVerifierImpl.java → briar-core/src/org/briarproject/messaging/MessageVerifierImpl.java
View File

@@ -1,22 +1,22 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
import java.security.GeneralSecurityException;
import javax.inject.Inject;
import net.sf.briar.api.Author;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyParser;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.crypto.PublicKey;
import net.sf.briar.api.crypto.Signature;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.system.Clock;
import org.briarproject.api.Author;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyParser;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.crypto.PublicKey;
import org.briarproject.api.crypto.Signature;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageId;
import org.briarproject.api.messaging.MessageVerifier;
import org.briarproject.api.messaging.UnverifiedMessage;
import org.briarproject.api.system.Clock;
class MessageVerifierImpl implements MessageVerifier {

26
briar-core/src/net/sf/briar/messaging/MessagingModule.java → briar-core/src/org/briarproject/messaging/MessagingModule.java
View File

@@ -1,17 +1,17 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.GroupFactory;
import net.sf.briar.api.messaging.MessageFactory;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.serial.StructReader;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.messaging.MessageFactory;
import org.briarproject.api.messaging.MessageVerifier;
import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.PacketWriterFactory;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.UnverifiedMessage;
import org.briarproject.api.serial.StructReader;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

14
briar-core/src/net/sf/briar/messaging/PacketReaderFactoryImpl.java → briar-core/src/org/briarproject/messaging/PacketReaderFactoryImpl.java
View File

@@ -1,15 +1,15 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import java.io.InputStream;
import javax.inject.Inject;
import net.sf.briar.api.messaging.PacketReader;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.StructReader;
import org.briarproject.api.messaging.PacketReader;
import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.UnverifiedMessage;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.StructReader;
class PacketReaderFactoryImpl implements PacketReaderFactory {

70
briar-core/src/net/sf/briar/messaging/PacketReaderImpl.java → briar-core/src/org/briarproject/messaging/PacketReaderImpl.java
View File

@@ -1,18 +1,18 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.Types.ACK;
import static net.sf.briar.api.messaging.Types.MESSAGE;
import static net.sf.briar.api.messaging.Types.OFFER;
import static net.sf.briar.api.messaging.Types.REQUEST;
import static net.sf.briar.api.messaging.Types.RETENTION_ACK;
import static net.sf.briar.api.messaging.Types.RETENTION_UPDATE;
import static net.sf.briar.api.messaging.Types.SUBSCRIPTION_ACK;
import static net.sf.briar.api.messaging.Types.SUBSCRIPTION_UPDATE;
import static net.sf.briar.api.messaging.Types.TRANSPORT_ACK;
import static net.sf.briar.api.messaging.Types.TRANSPORT_UPDATE;
import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static org.briarproject.api.messaging.Types.ACK;
import static org.briarproject.api.messaging.Types.MESSAGE;
import static org.briarproject.api.messaging.Types.OFFER;
import static org.briarproject.api.messaging.Types.REQUEST;
import static org.briarproject.api.messaging.Types.RETENTION_ACK;
import static org.briarproject.api.messaging.Types.RETENTION_UPDATE;
import static org.briarproject.api.messaging.Types.SUBSCRIPTION_ACK;
import static org.briarproject.api.messaging.Types.SUBSCRIPTION_UPDATE;
import static org.briarproject.api.messaging.Types.TRANSPORT_ACK;
import static org.briarproject.api.messaging.Types.TRANSPORT_UPDATE;
import java.io.IOException;
import java.io.InputStream;
@@ -22,27 +22,27 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.UniqueId;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.Offer;
import net.sf.briar.api.messaging.PacketReader;
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.messaging.UnverifiedMessage;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.CountingConsumer;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.StructReader;
import org.briarproject.api.FormatException;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.UniqueId;
import org.briarproject.api.messaging.Ack;
import org.briarproject.api.messaging.MessageId;
import org.briarproject.api.messaging.Offer;
import org.briarproject.api.messaging.PacketReader;
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.messaging.UnverifiedMessage;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.CountingConsumer;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.StructReader;
// This class is not thread-safe
class PacketReaderImpl implements PacketReader {

10
briar-core/src/net/sf/briar/messaging/PacketWriterFactoryImpl.java → briar-core/src/org/briarproject/messaging/PacketWriterFactoryImpl.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import java.io.OutputStream;
import javax.inject.Inject;
import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.serial.SerialComponent;
import net.sf.briar.api.serial.WriterFactory;
import org.briarproject.api.messaging.PacketWriter;
import org.briarproject.api.messaging.PacketWriterFactory;
import org.briarproject.api.serial.SerialComponent;
import org.briarproject.api.serial.WriterFactory;
class PacketWriterFactoryImpl implements PacketWriterFactory {

54
briar-core/src/net/sf/briar/messaging/PacketWriterImpl.java → briar-core/src/org/briarproject/messaging/PacketWriterImpl.java
View File

@@ -1,35 +1,35 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.Types.ACK;
import static net.sf.briar.api.messaging.Types.GROUP;
import static net.sf.briar.api.messaging.Types.OFFER;
import static net.sf.briar.api.messaging.Types.REQUEST;
import static net.sf.briar.api.messaging.Types.RETENTION_ACK;
import static net.sf.briar.api.messaging.Types.RETENTION_UPDATE;
import static net.sf.briar.api.messaging.Types.SUBSCRIPTION_ACK;
import static net.sf.briar.api.messaging.Types.SUBSCRIPTION_UPDATE;
import static net.sf.briar.api.messaging.Types.TRANSPORT_ACK;
import static net.sf.briar.api.messaging.Types.TRANSPORT_UPDATE;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static org.briarproject.api.messaging.Types.ACK;
import static org.briarproject.api.messaging.Types.GROUP;
import static org.briarproject.api.messaging.Types.OFFER;
import static org.briarproject.api.messaging.Types.REQUEST;
import static org.briarproject.api.messaging.Types.RETENTION_ACK;
import static org.briarproject.api.messaging.Types.RETENTION_UPDATE;
import static org.briarproject.api.messaging.Types.SUBSCRIPTION_ACK;
import static org.briarproject.api.messaging.Types.SUBSCRIPTION_UPDATE;
import static org.briarproject.api.messaging.Types.TRANSPORT_ACK;
import static org.briarproject.api.messaging.Types.TRANSPORT_UPDATE;
import java.io.IOException;
import java.io.OutputStream;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.Offer;
import net.sf.briar.api.messaging.PacketWriter;
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.serial.SerialComponent;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import org.briarproject.api.messaging.Ack;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.MessageId;
import org.briarproject.api.messaging.Offer;
import org.briarproject.api.messaging.PacketWriter;
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.serial.SerialComponent;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
// This class is not thread-safe
class PacketWriterImpl implements PacketWriter {

22
briar-core/src/net/sf/briar/messaging/SubscriptionUpdateReader.java → briar-core/src/org/briarproject/messaging/SubscriptionUpdateReader.java
View File

@@ -1,21 +1,21 @@
package net.sf.briar.messaging;
package org.briarproject.messaging;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
import static net.sf.briar.api.messaging.Types.SUBSCRIPTION_UPDATE;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
import static org.briarproject.api.messaging.Types.SUBSCRIPTION_UPDATE;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.messaging.Group;
import net.sf.briar.api.messaging.SubscriptionUpdate;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.CountingConsumer;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.StructReader;
import org.briarproject.api.FormatException;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.CountingConsumer;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.StructReader;
class SubscriptionUpdateReader implements StructReader<SubscriptionUpdate> {

88
briar-core/src/net/sf/briar/messaging/duplex/DuplexConnection.java → briar-core/src/org/briarproject/messaging/duplex/DuplexConnection.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.messaging.duplex;
package org.briarproject.messaging.duplex;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import java.io.IOException;
import java.io.InputStream;
@@ -15,48 +15,48 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.event.ContactRemovedEvent;
import net.sf.briar.api.event.Event;
import net.sf.briar.api.event.EventListener;
import net.sf.briar.api.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.LocalTransportsUpdatedEvent;
import net.sf.briar.api.event.MessageAddedEvent;
import net.sf.briar.api.event.MessageExpiredEvent;
import net.sf.briar.api.event.MessageRequestedEvent;
import net.sf.briar.api.event.MessageToAckEvent;
import net.sf.briar.api.event.MessageToRequestEvent;
import net.sf.briar.api.event.RemoteRetentionTimeUpdatedEvent;
import net.sf.briar.api.event.RemoteSubscriptionsUpdatedEvent;
import net.sf.briar.api.event.RemoteTransportsUpdatedEvent;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.Offer;
import net.sf.briar.api.messaging.PacketReader;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
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.messaging.UnverifiedMessage;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.util.ByteUtils;
import org.briarproject.api.ContactId;
import org.briarproject.api.FormatException;
import org.briarproject.api.TransportId;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.event.ContactRemovedEvent;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.LocalSubscriptionsUpdatedEvent;
import org.briarproject.api.event.LocalTransportsUpdatedEvent;
import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.event.MessageRequestedEvent;
import org.briarproject.api.event.MessageToAckEvent;
import org.briarproject.api.event.MessageToRequestEvent;
import org.briarproject.api.event.RemoteRetentionTimeUpdatedEvent;
import org.briarproject.api.event.RemoteSubscriptionsUpdatedEvent;
import org.briarproject.api.event.RemoteTransportsUpdatedEvent;
import org.briarproject.api.messaging.Ack;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageVerifier;
import org.briarproject.api.messaging.Offer;
import org.briarproject.api.messaging.PacketReader;
import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.PacketWriter;
import org.briarproject.api.messaging.PacketWriterFactory;
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.messaging.UnverifiedMessage;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionReader;
import org.briarproject.api.transport.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionRegistry;
import org.briarproject.api.transport.ConnectionWriter;
import org.briarproject.api.transport.ConnectionWriterFactory;
import org.briarproject.util.ByteUtils;
abstract class DuplexConnection implements EventListener {

32
briar-core/src/net/sf/briar/messaging/duplex/DuplexConnectionFactoryImpl.java → briar-core/src/org/briarproject/messaging/duplex/DuplexConnectionFactoryImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.messaging.duplex;
package org.briarproject.messaging.duplex;
import static java.util.logging.Level.WARNING;
@@ -7,21 +7,21 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.duplex.DuplexConnectionFactory;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.KeyManager;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DatabaseExecutor;
import org.briarproject.api.messaging.MessageVerifier;
import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.PacketWriterFactory;
import org.briarproject.api.messaging.duplex.DuplexConnectionFactory;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionRegistry;
import org.briarproject.api.transport.ConnectionWriterFactory;
class DuplexConnectionFactoryImpl implements DuplexConnectionFactory {

4
briar-core/src/net/sf/briar/messaging/duplex/DuplexMessagingModule.java → briar-core/src/org/briarproject/messaging/duplex/DuplexMessagingModule.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.messaging.duplex;
package org.briarproject.messaging.duplex;
import javax.inject.Singleton;
import net.sf.briar.api.messaging.duplex.DuplexConnectionFactory;
import org.briarproject.api.messaging.duplex.DuplexConnectionFactory;
import com.google.inject.AbstractModule;

24
briar-core/src/net/sf/briar/messaging/duplex/IncomingDuplexConnection.java → briar-core/src/org/briarproject/messaging/duplex/IncomingDuplexConnection.java
View File

@@ -1,21 +1,21 @@
package net.sf.briar.messaging.duplex;
package org.briarproject.messaging.duplex;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.concurrent.Executor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.messaging.MessageVerifier;
import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.PacketWriterFactory;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionReader;
import org.briarproject.api.transport.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionRegistry;
import org.briarproject.api.transport.ConnectionWriter;
import org.briarproject.api.transport.ConnectionWriterFactory;
class IncomingDuplexConnection extends DuplexConnection {

24
briar-core/src/net/sf/briar/messaging/duplex/OutgoingDuplexConnection.java → briar-core/src/org/briarproject/messaging/duplex/OutgoingDuplexConnection.java
View File

@@ -1,21 +1,21 @@
package net.sf.briar.messaging.duplex;
package org.briarproject.messaging.duplex;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.concurrent.Executor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.messaging.MessageVerifier;
import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.PacketWriterFactory;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionReader;
import org.briarproject.api.transport.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionRegistry;
import org.briarproject.api.transport.ConnectionWriter;
import org.briarproject.api.transport.ConnectionWriterFactory;
class OutgoingDuplexConnection extends DuplexConnection {

48
briar-core/src/net/sf/briar/messaging/simplex/IncomingSimplexConnection.java → briar-core/src/org/briarproject/messaging/simplex/IncomingSimplexConnection.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.messaging.simplex;
package org.briarproject.messaging.simplex;
import static java.util.logging.Level.WARNING;
@@ -8,29 +8,29 @@ import java.security.GeneralSecurityException;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Message;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReader;
import net.sf.briar.api.messaging.PacketReaderFactory;
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.messaging.UnverifiedMessage;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.util.ByteUtils;
import org.briarproject.api.ContactId;
import org.briarproject.api.FormatException;
import org.briarproject.api.TransportId;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.messaging.Ack;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageVerifier;
import org.briarproject.api.messaging.PacketReader;
import org.briarproject.api.messaging.PacketReaderFactory;
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.messaging.UnverifiedMessage;
import org.briarproject.api.plugins.simplex.SimplexTransportReader;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionReader;
import org.briarproject.api.transport.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionRegistry;
import org.briarproject.util.ByteUtils;
class IncomingSimplexConnection {

42
briar-core/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnection.java → briar-core/src/org/briarproject/messaging/simplex/OutgoingSimplexConnection.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.messaging.simplex;
package org.briarproject.messaging.simplex;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import java.io.EOFException;
import java.io.IOException;
@@ -9,25 +9,25 @@ import java.io.OutputStream;
import java.util.Collection;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
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.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.util.ByteUtils;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.messaging.Ack;
import org.briarproject.api.messaging.PacketWriter;
import org.briarproject.api.messaging.PacketWriterFactory;
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.plugins.simplex.SimplexTransportWriter;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionRegistry;
import org.briarproject.api.transport.ConnectionWriter;
import org.briarproject.api.transport.ConnectionWriterFactory;
import org.briarproject.util.ByteUtils;
class OutgoingSimplexConnection {

34
briar-core/src/net/sf/briar/messaging/simplex/SimplexConnectionFactoryImpl.java → briar-core/src/org/briarproject/messaging/simplex/SimplexConnectionFactoryImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.messaging.simplex;
package org.briarproject.messaging.simplex;
import static java.util.logging.Level.WARNING;
@@ -7,22 +7,22 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.messaging.simplex.SimplexConnectionFactory;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.KeyManager;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DatabaseExecutor;
import org.briarproject.api.messaging.MessageVerifier;
import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.PacketWriterFactory;
import org.briarproject.api.messaging.simplex.SimplexConnectionFactory;
import org.briarproject.api.plugins.simplex.SimplexTransportReader;
import org.briarproject.api.plugins.simplex.SimplexTransportWriter;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionReaderFactory;
import org.briarproject.api.transport.ConnectionRegistry;
import org.briarproject.api.transport.ConnectionWriterFactory;
class SimplexConnectionFactoryImpl implements SimplexConnectionFactory {

4
briar-core/src/net/sf/briar/messaging/simplex/SimplexMessagingModule.java → briar-core/src/org/briarproject/messaging/simplex/SimplexMessagingModule.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.messaging.simplex;
package org.briarproject.messaging.simplex;
import javax.inject.Singleton;
import net.sf.briar.api.messaging.simplex.SimplexConnectionFactory;
import org.briarproject.api.messaging.simplex.SimplexConnectionFactory;
import com.google.inject.AbstractModule;

48
briar-core/src/net/sf/briar/plugins/PluginManagerImpl.java → briar-core/src/org/briarproject/plugins/PluginManagerImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins;
package org.briarproject.plugins;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -16,29 +16,29 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.plugins.Plugin;
import net.sf.briar.api.plugins.PluginCallback;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.PluginManager;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginConfig;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.plugins.simplex.SimplexPlugin;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexPluginConfig;
import net.sf.briar.api.plugins.simplex.SimplexPluginFactory;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.ui.UiCallback;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportConfig;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.PluginCallback;
import org.briarproject.api.plugins.PluginExecutor;
import org.briarproject.api.plugins.PluginManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexPluginConfig;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.plugins.simplex.SimplexPlugin;
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.plugins.simplex.SimplexTransportReader;
import org.briarproject.api.plugins.simplex.SimplexTransportWriter;
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
// latch that depends on an alien call)

8
briar-core/src/net/sf/briar/plugins/PluginsModule.java → briar-core/src/org/briarproject/plugins/PluginsModule.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins;
package org.briarproject.plugins;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -11,9 +11,9 @@ import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.PluginManager;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.plugins.PluginExecutor;
import org.briarproject.api.plugins.PluginManager;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

4
briar-core/src/net/sf/briar/plugins/Poller.java → briar-core/src/org/briarproject/plugins/Poller.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.plugins;
package org.briarproject.plugins;
import java.util.Collection;
import net.sf.briar.api.plugins.Plugin;
import org.briarproject.api.plugins.Plugin;
interface Poller {

12
briar-core/src/net/sf/briar/plugins/PollerImpl.java → briar-core/src/org/briarproject/plugins/PollerImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins;
package org.briarproject.plugins;
import static java.util.logging.Level.INFO;
@@ -10,11 +10,11 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.plugins.Plugin;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.transport.ConnectionRegistry;
import org.briarproject.api.ContactId;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.PluginExecutor;
import org.briarproject.api.system.Clock;
import org.briarproject.api.transport.ConnectionRegistry;
class PollerImpl implements Poller, Runnable {

16
briar-core/src/net/sf/briar/plugins/file/FilePlugin.java → briar-core/src/org/briarproject/plugins/file/FilePlugin.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.plugins.file;
package org.briarproject.plugins.file;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;
import static org.briarproject.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;
import java.io.File;
import java.io.FileInputStream;
@@ -12,12 +12,12 @@ import java.util.Collection;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.plugins.simplex.SimplexPlugin;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.system.FileUtils;
import org.briarproject.api.ContactId;
import org.briarproject.api.plugins.simplex.SimplexPlugin;
import org.briarproject.api.plugins.simplex.SimplexPluginCallback;
import org.briarproject.api.plugins.simplex.SimplexTransportReader;
import org.briarproject.api.plugins.simplex.SimplexTransportWriter;
import org.briarproject.api.system.FileUtils;
public abstract class FilePlugin implements SimplexPlugin {

4
briar-core/src/net/sf/briar/plugins/file/FileTransportReader.java → briar-core/src/org/briarproject/plugins/file/FileTransportReader.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.file;
package org.briarproject.plugins.file;
import static java.util.logging.Level.WARNING;
@@ -7,7 +7,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.logging.Logger;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import org.briarproject.api.plugins.simplex.SimplexTransportReader;
class FileTransportReader implements SimplexTransportReader {

4
briar-core/src/net/sf/briar/plugins/file/FileTransportWriter.java → briar-core/src/org/briarproject/plugins/file/FileTransportWriter.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.file;
package org.briarproject.plugins.file;
import static java.util.logging.Level.WARNING;
@@ -7,7 +7,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.logging.Logger;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import org.briarproject.api.plugins.simplex.SimplexTransportWriter;
class FileTransportWriter implements SimplexTransportWriter {

20
briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java → briar-core/src/org/briarproject/plugins/tcp/LanTcpPlugin.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -21,15 +21,15 @@ import java.util.List;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.system.Clock;
import net.sf.briar.util.ByteUtils;
import net.sf.briar.util.LatchedReference;
import net.sf.briar.util.StringUtils;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.system.Clock;
import org.briarproject.util.ByteUtils;
import org.briarproject.util.LatchedReference;
import org.briarproject.util.StringUtils;
/** A socket plugin that supports exchanging invitations over a LAN. */
class LanTcpPlugin extends TcpPlugin {

14
briar-core/src/net/sf/briar/plugins/tcp/LanTcpPluginFactory.java → briar-core/src/org/briarproject/plugins/tcp/LanTcpPluginFactory.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import org.briarproject.api.TransportId;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.SystemClock;
public class LanTcpPluginFactory implements DuplexPluginFactory {

2
briar-core/src/net/sf/briar/plugins/tcp/MappingResult.java → briar-core/src/org/briarproject/plugins/tcp/MappingResult.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import java.net.InetAddress;
import java.net.InetSocketAddress;

2
briar-core/src/net/sf/briar/plugins/tcp/PortMapper.java → briar-core/src/org/briarproject/plugins/tcp/PortMapper.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
interface PortMapper {

4
briar-core/src/net/sf/briar/plugins/tcp/PortMapperImpl.java → briar-core/src/org/briarproject/plugins/tcp/PortMapperImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -10,7 +10,7 @@ import java.util.logging.Logger;
import javax.xml.parsers.ParserConfigurationException;
import net.sf.briar.api.lifecycle.ShutdownManager;
import org.briarproject.api.lifecycle.ShutdownManager;
import org.bitlet.weupnp.GatewayDevice;
import org.bitlet.weupnp.GatewayDiscover;

14
briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java → briar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@@ -16,12 +16,12 @@ import java.util.Map;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.util.StringUtils;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.util.StringUtils;
abstract class TcpPlugin implements DuplexPlugin {

6
briar-core/src/net/sf/briar/plugins/tcp/TcpTransportConnection.java → briar-core/src/org/briarproject/plugins/tcp/TcpTransportConnection.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import net.sf.briar.api.plugins.Plugin;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
class TcpTransportConnection implements DuplexTransportConnection {

14
briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java → briar-core/src/org/briarproject/plugins/tcp/WanTcpPlugin.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import static java.util.logging.Level.WARNING;
@@ -15,12 +15,12 @@ import java.util.List;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.util.StringUtils;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.util.StringUtils;
class WanTcpPlugin extends TcpPlugin {

12
briar-core/src/net/sf/briar/plugins/tcp/WanTcpPluginFactory.java → briar-core/src/org/briarproject/plugins/tcp/WanTcpPluginFactory.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.plugins.tcp;
package org.briarproject.plugins.tcp;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
import org.briarproject.api.TransportId;
import org.briarproject.api.lifecycle.ShutdownManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
public class WanTcpPluginFactory implements DuplexPluginFactory {

4
briar-core/src/net/sf/briar/reliability/Ack.java → briar-core/src/org/briarproject/reliability/Ack.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import net.sf.briar.util.ByteUtils;
import org.briarproject.util.ByteUtils;
class Ack extends Frame {

2
briar-core/src/net/sf/briar/reliability/Crc32.java → briar-core/src/org/briarproject/reliability/Crc32.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
class Crc32 {

2
briar-core/src/net/sf/briar/reliability/Data.java → briar-core/src/org/briarproject/reliability/Data.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
class Data extends Frame {

4
briar-core/src/net/sf/briar/reliability/Frame.java → briar-core/src/org/briarproject/reliability/Frame.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import net.sf.briar.util.ByteUtils;
import org.briarproject.util.ByteUtils;
abstract class Frame {

6
briar-core/src/net/sf/briar/reliability/Receiver.java → briar-core/src/org/briarproject/reliability/Receiver.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import java.io.IOException;
import java.util.Comparator;
@@ -6,8 +6,8 @@ import java.util.Iterator;
import java.util.SortedSet;
import java.util.TreeSet;
import net.sf.briar.api.reliability.ReadHandler;
import net.sf.briar.api.system.Clock;
import org.briarproject.api.reliability.ReadHandler;
import org.briarproject.api.system.Clock;
class Receiver implements ReadHandler {

2
briar-core/src/net/sf/briar/reliability/ReceiverInputStream.java → briar-core/src/org/briarproject/reliability/ReceiverInputStream.java
View File

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

14
briar-core/src/net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java → briar-core/src/org/briarproject/reliability/ReliabilityLayerFactoryImpl.java
View File

@@ -1,15 +1,15 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import java.util.concurrent.Executor;
import javax.inject.Inject;
import net.sf.briar.api.reliability.ReliabilityExecutor;
import net.sf.briar.api.reliability.ReliabilityLayer;
import net.sf.briar.api.reliability.ReliabilityLayerFactory;
import net.sf.briar.api.reliability.WriteHandler;
import net.sf.briar.api.system.Clock;
import net.sf.briar.api.system.SystemClock;
import org.briarproject.api.reliability.ReliabilityExecutor;
import org.briarproject.api.reliability.ReliabilityLayer;
import org.briarproject.api.reliability.ReliabilityLayerFactory;
import org.briarproject.api.reliability.WriteHandler;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.SystemClock;
class ReliabilityLayerFactoryImpl implements ReliabilityLayerFactory {

8
briar-core/src/net/sf/briar/reliability/ReliabilityLayerImpl.java → briar-core/src/org/briarproject/reliability/ReliabilityLayerImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.WARNING;
@@ -11,9 +11,9 @@ import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.logging.Logger;
import net.sf.briar.api.reliability.ReliabilityLayer;
import net.sf.briar.api.reliability.WriteHandler;
import net.sf.briar.api.system.Clock;
import org.briarproject.api.reliability.ReliabilityLayer;
import org.briarproject.api.reliability.WriteHandler;
import org.briarproject.api.system.Clock;
class ReliabilityLayerImpl implements ReliabilityLayer, WriteHandler {

8
briar-core/src/net/sf/briar/reliability/ReliabilityModule.java → briar-core/src/org/briarproject/reliability/ReliabilityModule.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -11,9 +11,9 @@ import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.reliability.ReliabilityExecutor;
import net.sf.briar.api.reliability.ReliabilityLayerFactory;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.reliability.ReliabilityExecutor;
import org.briarproject.api.reliability.ReliabilityLayerFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

6
briar-core/src/net/sf/briar/reliability/Sender.java → briar-core/src/org/briarproject/reliability/Sender.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import java.io.IOException;
import java.util.ArrayList;
@@ -6,8 +6,8 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import net.sf.briar.api.reliability.WriteHandler;
import net.sf.briar.api.system.Clock;
import org.briarproject.api.reliability.WriteHandler;
import org.briarproject.api.system.Clock;
class Sender {

2
briar-core/src/net/sf/briar/reliability/SenderOutputStream.java → briar-core/src/org/briarproject/reliability/SenderOutputStream.java
View File

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

4
briar-core/src/net/sf/briar/reliability/SlipDecoder.java → briar-core/src/org/briarproject/reliability/SlipDecoder.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import java.io.IOException;
import net.sf.briar.api.reliability.ReadHandler;
import org.briarproject.api.reliability.ReadHandler;
class SlipDecoder implements ReadHandler {

4
briar-core/src/net/sf/briar/reliability/SlipEncoder.java → briar-core/src/org/briarproject/reliability/SlipEncoder.java
View File

@@ -1,8 +1,8 @@
package net.sf.briar.reliability;
package org.briarproject.reliability;
import java.io.IOException;
import net.sf.briar.api.reliability.WriteHandler;
import org.briarproject.api.reliability.WriteHandler;
class SlipEncoder implements WriteHandler {

6
briar-core/src/net/sf/briar/serial/ReaderFactoryImpl.java → briar-core/src/org/briarproject/serial/ReaderFactoryImpl.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.serial;
package org.briarproject.serial;
import java.io.InputStream;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ReaderFactory;
class ReaderFactoryImpl implements ReaderFactory {

8
briar-core/src/net/sf/briar/serial/ReaderImpl.java → briar-core/src/org/briarproject/serial/ReaderImpl.java
View File

@@ -1,13 +1,13 @@
package net.sf.briar.serial;
package org.briarproject.serial;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.Reader;
import org.briarproject.api.FormatException;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.Reader;
// This class is not thread-safe
class ReaderImpl implements Reader {

6
briar-core/src/net/sf/briar/serial/SerialComponentImpl.java → briar-core/src/org/briarproject/serial/SerialComponentImpl.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.serial;
package org.briarproject.serial;
import net.sf.briar.api.UniqueId;
import net.sf.briar.api.serial.SerialComponent;
import org.briarproject.api.UniqueId;
import org.briarproject.api.serial.SerialComponent;
class SerialComponentImpl implements SerialComponent {

8
briar-core/src/net/sf/briar/serial/SerialModule.java → briar-core/src/org/briarproject/serial/SerialModule.java
View File

@@ -1,10 +1,10 @@
package net.sf.briar.serial;
package org.briarproject.serial;
import javax.inject.Singleton;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.SerialComponent;
import net.sf.briar.api.serial.WriterFactory;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.SerialComponent;
import org.briarproject.api.serial.WriterFactory;
import com.google.inject.AbstractModule;

2
briar-core/src/net/sf/briar/serial/Tag.java → briar-core/src/org/briarproject/serial/Tag.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.serial;
package org.briarproject.serial;
interface Tag {

6
briar-core/src/net/sf/briar/serial/WriterFactoryImpl.java → briar-core/src/org/briarproject/serial/WriterFactoryImpl.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.serial;
package org.briarproject.serial;
import java.io.OutputStream;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
class WriterFactoryImpl implements WriterFactory {

8
briar-core/src/net/sf/briar/serial/WriterImpl.java → briar-core/src/org/briarproject/serial/WriterImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.serial;
package org.briarproject.serial;
import java.io.IOException;
import java.io.OutputStream;
@@ -8,9 +8,9 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import net.sf.briar.api.Bytes;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.Writer;
import org.briarproject.api.Bytes;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.Writer;
// This class is not thread-safe
class WriterImpl implements Writer {

16
briar-core/src/org/briarproject/system/SystemModule.java Normal file
View File

@@ -0,0 +1,16 @@
package org.briarproject.system;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.SystemClock;
import org.briarproject.api.system.SystemTimer;
import org.briarproject.api.system.Timer;
import com.google.inject.AbstractModule;
public class SystemModule extends AbstractModule {
protected void configure() {
bind(Clock.class).to(SystemClock.class);
bind(Timer.class).to(SystemTimer.class);
}
}

28
briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java → briar-core/src/org/briarproject/transport/ConnectionDispatcherImpl.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.transport;
package org.briarproject.transport;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
import java.io.EOFException;
import java.io.IOException;
@@ -11,18 +11,18 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.messaging.duplex.DuplexConnectionFactory;
import net.sf.briar.api.messaging.simplex.SimplexConnectionFactory;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.IncomingConnectionExecutor;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.db.DbException;
import org.briarproject.api.messaging.duplex.DuplexConnectionFactory;
import org.briarproject.api.messaging.simplex.SimplexConnectionFactory;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.plugins.simplex.SimplexTransportReader;
import org.briarproject.api.plugins.simplex.SimplexTransportWriter;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionDispatcher;
import org.briarproject.api.transport.ConnectionRecogniser;
import org.briarproject.api.transport.IncomingConnectionExecutor;
class ConnectionDispatcherImpl implements ConnectionDispatcher {

12
briar-core/src/net/sf/briar/transport/ConnectionReaderFactoryImpl.java → briar-core/src/org/briarproject/transport/ConnectionReaderFactoryImpl.java
View File

@@ -1,14 +1,14 @@
package net.sf.briar.transport;
package org.briarproject.transport;
import java.io.InputStream;
import javax.inject.Inject;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.SecretKey;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionReader;
import org.briarproject.api.transport.ConnectionReaderFactory;
class ConnectionReaderFactoryImpl implements ConnectionReaderFactory {

8
briar-core/src/net/sf/briar/transport/ConnectionReaderImpl.java → briar-core/src/org/briarproject/transport/ConnectionReaderImpl.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.transport;
package org.briarproject.transport;
import static net.sf.briar.api.transport.TransportConstants.HEADER_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MAC_LENGTH;
import static org.briarproject.api.transport.TransportConstants.HEADER_LENGTH;
import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
import java.io.IOException;
import java.io.InputStream;
import net.sf.briar.api.transport.ConnectionReader;
import org.briarproject.api.transport.ConnectionReader;
class ConnectionReaderImpl extends InputStream implements ConnectionReader {

18
briar-core/src/net/sf/briar/transport/ConnectionRecogniserImpl.java → briar-core/src/org/briarproject/transport/ConnectionRecogniserImpl.java
View File

@@ -1,18 +1,18 @@
package net.sf.briar.transport;
package org.briarproject.transport;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.TemporarySecret;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionRecogniser;
import org.briarproject.api.transport.TemporarySecret;
class ConnectionRecogniserImpl implements ConnectionRecogniser {

10
briar-core/src/net/sf/briar/transport/ConnectionRegistryImpl.java → briar-core/src/org/briarproject/transport/ConnectionRegistryImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport;
package org.briarproject.transport;
import static java.util.logging.Level.INFO;
@@ -11,10 +11,10 @@ import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.transport.ConnectionListener;
import net.sf.briar.api.transport.ConnectionRegistry;
import org.briarproject.api.ContactId;
import org.briarproject.api.TransportId;
import org.briarproject.api.transport.ConnectionListener;
import org.briarproject.api.transport.ConnectionRegistry;
class ConnectionRegistryImpl implements ConnectionRegistry {

6
briar-core/src/net/sf/briar/transport/ConnectionWindow.java → briar-core/src/org/briarproject/transport/ConnectionWindow.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.transport;
package org.briarproject.transport;
import static net.sf.briar.api.transport.TransportConstants.CONNECTION_WINDOW_SIZE;
import static net.sf.briar.util.ByteUtils.MAX_32_BIT_UNSIGNED;
import static org.briarproject.api.transport.TransportConstants.CONNECTION_WINDOW_SIZE;
import static org.briarproject.util.ByteUtils.MAX_32_BIT_UNSIGNED;
import java.util.ArrayList;
import java.util.Collection;

14
briar-core/src/net/sf/briar/transport/ConnectionWriterFactoryImpl.java → briar-core/src/org/briarproject/transport/ConnectionWriterFactoryImpl.java
View File

@@ -1,16 +1,16 @@
package net.sf.briar.transport;
package org.briarproject.transport;
import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
import static org.briarproject.api.transport.TransportConstants.TAG_LENGTH;
import java.io.OutputStream;
import javax.inject.Inject;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.SecretKey;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.api.transport.ConnectionContext;
import org.briarproject.api.transport.ConnectionWriter;
import org.briarproject.api.transport.ConnectionWriterFactory;
class ConnectionWriterFactoryImpl implements ConnectionWriterFactory {

8
briar-core/src/net/sf/briar/transport/ConnectionWriterImpl.java → briar-core/src/org/briarproject/transport/ConnectionWriterImpl.java
View File

@@ -1,12 +1,12 @@
package net.sf.briar.transport;
package org.briarproject.transport;
import static net.sf.briar.api.transport.TransportConstants.HEADER_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.MAC_LENGTH;
import static org.briarproject.api.transport.TransportConstants.HEADER_LENGTH;
import static org.briarproject.api.transport.TransportConstants.MAC_LENGTH;
import java.io.IOException;
import java.io.OutputStream;
import net.sf.briar.api.transport.ConnectionWriter;
import org.briarproject.api.transport.ConnectionWriter;
/**
* A ConnectionWriter that buffers its input and writes a frame whenever there

Some files were not shown because too many files have changed in this diff Show More