Moved API classes into a separate project to enforce dependency rules.

2026-02-11 18:29:05 +01:00 · 2012-12-05 22:19:12 +00:00
parent 5204e0b907
commit f5626bee05
124 changed files with 106 additions and 27 deletions
--- a/briar-android/.classpath
+++ b/briar-android/.classpath
@@ -5,6 +5,7 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/briar-core"/>
-	<classpathentry kind="lib" path="/briar-core/libs/guice-3.0-no_aop.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
+	<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
--- a/briar-api/.classpath
+++ b/briar-api/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="lib" path="libs/android.jar"/>
+	<classpathentry kind="lib" path="libs/guice-3.0-no_aop.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
--- a/briar-api/.gitignore
+++ b/briar-api/.gitignore
@@ -0,0 +1,2 @@
+bin
+build
--- a/briar-api/.project
+++ b/briar-api/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>briar-api</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/briar-api/libs/android.jar
+++ b/briar-api/libs/android.jar
--- a/briar-core/libs/guice-3.0-no_aop.jar
+++ b/briar-core/libs/guice-3.0-no_aop.jar
--- a/briar-api/src/build.xml
+++ b/briar-api/src/build.xml
@@ -0,0 +1,21 @@
+<project name='briar-api' default='compile'>
+	<fileset id='api-jars' dir='../libs'>
+		<include name='*.jar'/>
+	</fileset>
+	<path id='api-classes'>
+		<pathelement location='../build'/>
+	</path>
+	<target name='clean'>
+		<delete dir='../build'/>
+	</target>
+	<target name='compile'>
+		<mkdir dir='../build'/>
+		<javac srcdir='.' destdir='../build' source='1.5'
+			includeantruntime='false' debug='off'>
+			<classpath>
+				<fileset refid='api-jars'/>
+				<path refid='api-classes'/>
+			</classpath>
+		</javac>
+	</target>
+</project>
--- a/briar-core/src/net/sf/briar/api/Bytes.java
+++ b/briar-core/src/net/sf/briar/api/Bytes.java
--- a/briar-core/src/net/sf/briar/api/ContactId.java
+++ b/briar-core/src/net/sf/briar/api/ContactId.java
--- a/briar-core/src/net/sf/briar/api/FormatException.java
+++ b/briar-core/src/net/sf/briar/api/FormatException.java
--- a/briar-core/src/net/sf/briar/api/Rating.java
+++ b/briar-core/src/net/sf/briar/api/Rating.java
--- a/briar-core/src/net/sf/briar/api/TransportConfig.java
+++ b/briar-core/src/net/sf/briar/api/TransportConfig.java
--- a/briar-core/src/net/sf/briar/api/TransportProperties.java
+++ b/briar-core/src/net/sf/briar/api/TransportProperties.java
--- a/briar-core/src/net/sf/briar/api/android/AndroidExecutor.java
+++ b/briar-core/src/net/sf/briar/api/android/AndroidExecutor.java
--- a/briar-core/src/net/sf/briar/api/clock/Clock.java
+++ b/briar-core/src/net/sf/briar/api/clock/Clock.java
--- a/briar-core/src/net/sf/briar/api/clock/SystemClock.java
+++ b/briar-core/src/net/sf/briar/api/clock/SystemClock.java
--- a/briar-core/src/net/sf/briar/api/clock/SystemTimer.java
+++ b/briar-core/src/net/sf/briar/api/clock/SystemTimer.java
--- a/briar-core/src/net/sf/briar/api/clock/Timer.java
+++ b/briar-core/src/net/sf/briar/api/clock/Timer.java
--- a/briar-core/src/net/sf/briar/api/crypto/AuthenticatedCipher.java
+++ b/briar-core/src/net/sf/briar/api/crypto/AuthenticatedCipher.java
--- a/briar-core/src/net/sf/briar/api/crypto/CryptoComponent.java
+++ b/briar-core/src/net/sf/briar/api/crypto/CryptoComponent.java
--- a/briar-core/src/net/sf/briar/api/crypto/ErasableKey.java
+++ b/briar-core/src/net/sf/briar/api/crypto/ErasableKey.java
--- a/briar-core/src/net/sf/briar/api/crypto/KeyManager.java
+++ b/briar-core/src/net/sf/briar/api/crypto/KeyManager.java
--- a/briar-core/src/net/sf/briar/api/crypto/KeyParser.java
+++ b/briar-core/src/net/sf/briar/api/crypto/KeyParser.java
--- a/briar-core/src/net/sf/briar/api/crypto/MessageDigest.java
+++ b/briar-core/src/net/sf/briar/api/crypto/MessageDigest.java
--- a/briar-core/src/net/sf/briar/api/crypto/Password.java
+++ b/briar-core/src/net/sf/briar/api/crypto/Password.java
--- a/briar-core/src/net/sf/briar/api/crypto/PseudoRandom.java
+++ b/briar-core/src/net/sf/briar/api/crypto/PseudoRandom.java
--- a/briar-core/src/net/sf/briar/api/db/DatabaseComponent.java
+++ b/briar-core/src/net/sf/briar/api/db/DatabaseComponent.java
--- a/briar-core/src/net/sf/briar/api/db/DatabaseConfig.java
+++ b/briar-core/src/net/sf/briar/api/db/DatabaseConfig.java
--- a/briar-core/src/net/sf/briar/api/db/DatabaseExecutor.java
+++ b/briar-core/src/net/sf/briar/api/db/DatabaseExecutor.java
--- a/briar-core/src/net/sf/briar/api/db/DbClosedException.java
+++ b/briar-core/src/net/sf/briar/api/db/DbClosedException.java
--- a/briar-core/src/net/sf/briar/api/db/DbException.java
+++ b/briar-core/src/net/sf/briar/api/db/DbException.java
--- a/briar-core/src/net/sf/briar/api/db/MessageHeader.java
+++ b/briar-core/src/net/sf/briar/api/db/MessageHeader.java
--- a/briar-core/src/net/sf/briar/api/db/NoSuchContactException.java
+++ b/briar-core/src/net/sf/briar/api/db/NoSuchContactException.java
--- a/briar-core/src/net/sf/briar/api/db/NoSuchContactTransportException.java
+++ b/briar-core/src/net/sf/briar/api/db/NoSuchContactTransportException.java
--- a/briar-core/src/net/sf/briar/api/db/event/BatchReceivedEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/BatchReceivedEvent.java
--- a/briar-core/src/net/sf/briar/api/db/event/ContactAddedEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/ContactAddedEvent.java
--- a/briar-core/src/net/sf/briar/api/db/event/ContactRemovedEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/ContactRemovedEvent.java
--- a/briar-core/src/net/sf/briar/api/db/event/DatabaseEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/DatabaseEvent.java
--- a/briar-core/src/net/sf/briar/api/db/event/DatabaseListener.java
+++ b/briar-core/src/net/sf/briar/api/db/event/DatabaseListener.java
--- a/briar-core/src/net/sf/briar/api/db/event/LocalTransportsUpdatedEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/LocalTransportsUpdatedEvent.java
--- a/briar-core/src/net/sf/briar/api/db/event/MessagesAddedEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/MessagesAddedEvent.java
--- a/briar-core/src/net/sf/briar/api/db/event/RatingChangedEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/RatingChangedEvent.java
--- a/briar-core/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/RemoteTransportsUpdatedEvent.java
--- a/briar-core/src/net/sf/briar/api/db/event/SubscriptionsUpdatedEvent.java
+++ b/briar-core/src/net/sf/briar/api/db/event/SubscriptionsUpdatedEvent.java
--- a/briar-core/src/net/sf/briar/api/invitation/InvitationListener.java
+++ b/briar-core/src/net/sf/briar/api/invitation/InvitationListener.java
--- a/briar-core/src/net/sf/briar/api/invitation/InvitationManager.java
+++ b/briar-core/src/net/sf/briar/api/invitation/InvitationManager.java
--- a/briar-core/src/net/sf/briar/api/invitation/InvitationState.java
+++ b/briar-core/src/net/sf/briar/api/invitation/InvitationState.java
--- a/briar-core/src/net/sf/briar/api/invitation/InvitationTask.java
+++ b/briar-core/src/net/sf/briar/api/invitation/InvitationTask.java
--- a/briar-core/src/net/sf/briar/api/lifecycle/ShutdownManager.java
+++ b/briar-core/src/net/sf/briar/api/lifecycle/ShutdownManager.java
--- a/briar-core/src/net/sf/briar/api/plugins/InvitationConstants.java
+++ b/briar-core/src/net/sf/briar/api/plugins/InvitationConstants.java
--- a/briar-core/src/net/sf/briar/api/plugins/Plugin.java
+++ b/briar-core/src/net/sf/briar/api/plugins/Plugin.java
--- a/briar-core/src/net/sf/briar/api/plugins/PluginCallback.java
+++ b/briar-core/src/net/sf/briar/api/plugins/PluginCallback.java
--- a/briar-core/src/net/sf/briar/api/plugins/PluginExecutor.java
+++ b/briar-core/src/net/sf/briar/api/plugins/PluginExecutor.java
--- a/briar-core/src/net/sf/briar/api/plugins/PluginManager.java
+++ b/briar-core/src/net/sf/briar/api/plugins/PluginManager.java
--- a/briar-core/src/net/sf/briar/api/plugins/duplex/DuplexPlugin.java
+++ b/briar-core/src/net/sf/briar/api/plugins/duplex/DuplexPlugin.java
--- a/briar-core/src/net/sf/briar/api/plugins/duplex/DuplexPluginCallback.java
+++ b/briar-core/src/net/sf/briar/api/plugins/duplex/DuplexPluginCallback.java
--- a/briar-core/src/net/sf/briar/api/plugins/duplex/DuplexPluginFactory.java
+++ b/briar-core/src/net/sf/briar/api/plugins/duplex/DuplexPluginFactory.java
--- a/briar-core/src/net/sf/briar/api/plugins/duplex/DuplexTransportConnection.java
+++ b/briar-core/src/net/sf/briar/api/plugins/duplex/DuplexTransportConnection.java
--- a/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexPlugin.java
+++ b/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexPlugin.java
--- a/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexPluginCallback.java
+++ b/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexPluginCallback.java
--- a/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexPluginFactory.java
+++ b/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexPluginFactory.java
--- a/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexTransportReader.java
+++ b/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexTransportReader.java
--- a/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexTransportWriter.java
+++ b/briar-core/src/net/sf/briar/api/plugins/simplex/SimplexTransportWriter.java
--- a/briar-core/src/net/sf/briar/api/protocol/Ack.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Ack.java
--- a/briar-core/src/net/sf/briar/api/protocol/Author.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Author.java
--- a/briar-core/src/net/sf/briar/api/protocol/AuthorFactory.java
+++ b/briar-core/src/net/sf/briar/api/protocol/AuthorFactory.java
--- a/briar-core/src/net/sf/briar/api/protocol/AuthorId.java
+++ b/briar-core/src/net/sf/briar/api/protocol/AuthorId.java
--- a/briar-core/src/net/sf/briar/api/protocol/Batch.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Batch.java
--- a/briar-core/src/net/sf/briar/api/protocol/BatchId.java
+++ b/briar-core/src/net/sf/briar/api/protocol/BatchId.java
--- a/briar-core/src/net/sf/briar/api/protocol/Group.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Group.java
--- a/briar-core/src/net/sf/briar/api/protocol/GroupFactory.java
+++ b/briar-core/src/net/sf/briar/api/protocol/GroupFactory.java
--- a/briar-core/src/net/sf/briar/api/protocol/GroupId.java
+++ b/briar-core/src/net/sf/briar/api/protocol/GroupId.java
--- a/briar-core/src/net/sf/briar/api/protocol/Message.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Message.java
--- a/briar-core/src/net/sf/briar/api/protocol/MessageFactory.java
+++ b/briar-core/src/net/sf/briar/api/protocol/MessageFactory.java
--- a/briar-core/src/net/sf/briar/api/protocol/MessageId.java
+++ b/briar-core/src/net/sf/briar/api/protocol/MessageId.java
--- a/briar-core/src/net/sf/briar/api/protocol/Offer.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Offer.java
--- a/briar-core/src/net/sf/briar/api/protocol/PacketFactory.java
+++ b/briar-core/src/net/sf/briar/api/protocol/PacketFactory.java
--- a/briar-core/src/net/sf/briar/api/protocol/ProtocolConstants.java
+++ b/briar-core/src/net/sf/briar/api/protocol/ProtocolConstants.java
--- a/briar-core/src/net/sf/briar/api/protocol/ProtocolReader.java
+++ b/briar-core/src/net/sf/briar/api/protocol/ProtocolReader.java
--- a/briar-core/src/net/sf/briar/api/protocol/ProtocolReaderFactory.java
+++ b/briar-core/src/net/sf/briar/api/protocol/ProtocolReaderFactory.java
--- a/briar-core/src/net/sf/briar/api/protocol/ProtocolWriter.java
+++ b/briar-core/src/net/sf/briar/api/protocol/ProtocolWriter.java
--- a/briar-core/src/net/sf/briar/api/protocol/ProtocolWriterFactory.java
+++ b/briar-core/src/net/sf/briar/api/protocol/ProtocolWriterFactory.java
--- a/briar-core/src/net/sf/briar/api/protocol/RawBatch.java
+++ b/briar-core/src/net/sf/briar/api/protocol/RawBatch.java
--- a/briar-core/src/net/sf/briar/api/protocol/Request.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Request.java
--- a/briar-core/src/net/sf/briar/api/protocol/SubscriptionUpdate.java
+++ b/briar-core/src/net/sf/briar/api/protocol/SubscriptionUpdate.java
--- a/briar-core/src/net/sf/briar/api/protocol/Transport.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Transport.java
--- a/briar-core/src/net/sf/briar/api/protocol/TransportId.java
+++ b/briar-core/src/net/sf/briar/api/protocol/TransportId.java
--- a/briar-core/src/net/sf/briar/api/protocol/TransportUpdate.java
+++ b/briar-core/src/net/sf/briar/api/protocol/TransportUpdate.java
--- a/briar-core/src/net/sf/briar/api/protocol/Types.java
+++ b/briar-core/src/net/sf/briar/api/protocol/Types.java
--- a/briar-core/src/net/sf/briar/api/protocol/UniqueId.java
+++ b/briar-core/src/net/sf/briar/api/protocol/UniqueId.java
--- a/briar-core/src/net/sf/briar/api/protocol/UnverifiedBatch.java
+++ b/briar-core/src/net/sf/briar/api/protocol/UnverifiedBatch.java
--- a/briar-core/src/net/sf/briar/api/protocol/VerificationExecutor.java
+++ b/briar-core/src/net/sf/briar/api/protocol/VerificationExecutor.java
--- a/briar-core/src/net/sf/briar/api/protocol/duplex/DuplexConnectionFactory.java
+++ b/briar-core/src/net/sf/briar/api/protocol/duplex/DuplexConnectionFactory.java
--- a/briar-core/src/net/sf/briar/api/protocol/simplex/SimplexConnectionFactory.java
+++ b/briar-core/src/net/sf/briar/api/protocol/simplex/SimplexConnectionFactory.java
--- a/briar-core/src/net/sf/briar/api/serial/Consumer.java
+++ b/briar-core/src/net/sf/briar/api/serial/Consumer.java
--- a/briar-core/src/net/sf/briar/api/serial/CopyingConsumer.java
+++ b/briar-core/src/net/sf/briar/api/serial/CopyingConsumer.java
--- a/briar-core/src/net/sf/briar/api/serial/CountingConsumer.java
+++ b/briar-core/src/net/sf/briar/api/serial/CountingConsumer.java
--- a/briar-core/src/net/sf/briar/api/serial/DigestingConsumer.java
+++ b/briar-core/src/net/sf/briar/api/serial/DigestingConsumer.java
--- a/briar-core/src/net/sf/briar/api/serial/Reader.java
+++ b/briar-core/src/net/sf/briar/api/serial/Reader.java
--- a/briar-core/src/net/sf/briar/api/serial/ReaderFactory.java
+++ b/briar-core/src/net/sf/briar/api/serial/ReaderFactory.java
--- a/Show More
+++ b/Show More