Restructured project prior to merging changes from Afsnit repo.

.classpath

@@ -1,28 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
+<classpath>
-	<classpathentry excluding=".gitignore|build.xml" kind="src" path="api"/>
+	<classpathentry excluding=".gitignore|build.xml" kind="src" path="src"/>
-	<classpathentry excluding=".gitignore|build.xml" kind="src" path="components"/>
+	<classpathentry kind="src" path="i18n"/>
-	<classpathentry kind="src" path="i18n"/>
+	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry excluding=".gitignore|build.xml" kind="src" path="util"/>
+	<classpathentry kind="lib" path="libs/activation.jar"/>
-	<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/bluecove-2.1.0-briar.jar"/>
-	<classpathentry kind="lib" path="lib/guice-3.0-no_aop.jar"/>
+	<classpathentry kind="lib" path="libs/bluecove-gpl-2.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/javax.inject-1.jar"/>
+	<classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/test/hamcrest-core-1.1.jar"/>
+	<classpathentry kind="lib" path="libs/guice-3.0-no_aop.jar"/>
-	<classpathentry kind="lib" path="lib/test/hamcrest-library-1.1.jar"/>
+	<classpathentry kind="lib" path="libs/h2small-1.3.161.jar"/>
-	<classpathentry kind="lib" path="lib/test/jmock-2.5.1.jar"/>
+	<classpathentry kind="lib" path="libs/javax.inject-1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-io-2.0.1.jar"/>
+	<classpathentry kind="lib" path="libs/jna.jar"/>
-	<classpathentry kind="lib" path="lib/test/junit-4.9b3.jar"/>
+	<classpathentry kind="lib" path="libs/jnotify-0.93.jar"/>
-	<classpathentry kind="lib" path="lib/jna.jar"/>
+	<classpathentry kind="lib" path="libs/mail.jar"/>
-	<classpathentry kind="lib" path="lib/platform.jar"/>
+	<classpathentry kind="lib" path="libs/platform.jar"/>
-	<classpathentry kind="lib" path="lib/jnotify-0.93.jar"/>
+	<classpathentry kind="lib" path="libs/sc-light-jdk15on-20120824.jar"/>
-	<classpathentry kind="lib" path="lib/bluecove-gpl-2.1.0.jar" sourcepath="lib/source/bluecove-gpl-2.1.0-sources.jar"/>
+	<classpathentry kind="lib" path="libs/scprov-jdk15on-20120824.jar"/>
-	<classpathentry kind="lib" path="lib/bluecove-2.1.0-briar.jar" sourcepath="lib/source/bluecove-2.1.0-briar-sources.jar"/>
+	<classpathentry kind="lib" path="libs/silvertunnel.org_netlib.jar"/>
-	<classpathentry kind="lib" path="lib/h2small-1.3.161.jar"/>
+	<classpathentry kind="lib" path="libs/test/hamcrest-core-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/silvertunnel.org_netlib.jar"/>
+	<classpathentry kind="lib" path="libs/test/hamcrest-library-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/sc-light-jdk15on-20120824.jar" sourcepath="lib/source/sc-light-jdk15on-sources-20120824.jar"/>
+	<classpathentry kind="lib" path="libs/test/jmock-2.5.1.jar"/>
-	<classpathentry kind="lib" path="lib/scprov-jdk15on-20120824.jar" sourcepath="lib/source/scprov-jdk15on-sources-20120824.jar"/>
+	<classpathentry kind="lib" path="libs/test/junit-4.9b3.jar"/>
-	<classpathentry kind="lib" path="lib/activation.jar"/>
+	<classpathentry kind="output" path="bin"/>
-	<classpathentry kind="lib" path="lib/mail.jar"/>
+</classpath>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

build-common.xml

@@ -1,24 +1,18 @@
 <project name='build-common'>
 	<import file='dependencies.xml'/>
 	<dirname property='build-common.root' file='${ant.file.build-common}'/>
-	<fileset id='bundled-jars' dir='${build-common.root}/lib'>
+	<fileset id='bundled-jars' dir='${build-common.root}/libs'>
 		<include name='*.jar'/>
 	</fileset>
-	<fileset id='test-jars' dir='${build-common.root}/lib/test'>
+	<fileset id='test-jars' dir='${build-common.root}/libs/test'>
 		<include name='*.jar'/>
 	</fileset>
-	<path id='api-classes'>
+	<path id='classes'>
-		<pathelement location='${build-common.root}/api/build'/>
+		<pathelement location='${build-common.root}/src/build'/>
-	</path>
-	<path id='component-classes'>
-		<pathelement location='${build-common.root}/components/build'/>
 	</path>
 	<path id='test-classes'>
 		<pathelement location='${build-common.root}/test/build'/>
 	</path>
-	<path id='util-classes'>
-		<pathelement location='${build-common.root}/util/build'/>
-	</path>
 	<target name='clean'>
 		<delete dir='build'/>
 		<delete dir='test.tmp'/>
@@ -30,9 +24,7 @@
 			<classpath>
 				<fileset refid='bundled-jars'/>
 				<fileset refid='test-jars'/>
-				<path refid='api-classes'/>
+				<path refid='classes'/>
-				<path refid='component-classes'/>
-				<path refid='util-classes'/>
 			</classpath>
 		</javac>
 	</target>

build.xml

@@ -7,10 +7,7 @@
 				<fileset refid='bundled-jars'/>
 			</classpath>
 			<fileset dir='.' defaultexcludes='yes'>
-				<include name='api/net/sf/briar/**'/>
+				<include name='src/net/sf/briar/**'/>
-				<include name='components/net/sf/briar/**'/>
-				<include name='installer/net/sf/briar/**'/>
-				<include name='util/net/sf/briar/**'/>
 			</fileset>
 		</javadoc>
 	</target>

components/.gitignore

@@ -1 +0,0 @@
-/build

components/build.xml

@@ -1,3 +0,0 @@
-<project name='components' default='depend'>
-	<import file='../build-common.xml'/>
-</project>

dependencies.xml

@@ -1,39 +1,21 @@
 <project name='dependencies'>
 	<dirname property='depend.root' file='${ant.file.dependencies}'/>
-	<target name='depend.all' depends='depend.components'/>
+	<target name='depend.all' depends='depend.src'/>
-	<target name='depend.api'>
+	<target name='depend.src'>
-		<ant dir='${depend.root}/api' target='compile'
+		<ant dir='${depend.root}/src' target='compile'
 			inheritAll='false'/>
 	</target>
-	<target name='depend.components' depends='depend.api, depend.util'>
+	<target name='depend.test' depends='depend.src'>
-		<ant dir='${depend.root}/components' target='compile'
-			inheritAll='false'/>
-	</target>
-	<target name='depend.test' depends='depend.components'>
 		<ant dir='${depend.root}/test' target='compile'
 			inheritAll='false'/>
 	</target>
-	<target name='depend.util'>
+	<target name='depend-clean.all' depends='depend-clean.src'/>
-		<ant dir='${depend.root}/util' target='compile'
+	<target name='depend-clean.src'>
+		<ant dir='${depend.root}/src' target='clean'
 			inheritAll='false'/>
 	</target>
-	<target name='depend-clean.all' depends='depend-clean.components'/>
+	<target name='depend-clean.test' depends='depend-clean.src'>
-	<target name='depend-clean.api'>
-		<ant dir='${depend.root}/api' target='clean'
-			inheritAll='false'/>
-	</target>
-	<target name='depend-clean.components'
-		depends='depend-clean.api, depend-clean.util'>
-		<ant dir='${depend.root}/components' target='clean'
-			inheritAll='false'/>
-	</target>
-	<target name='depend-clean.test'
-		depends='depend-clean.components'>
 		<ant dir='${depend.root}/test' target='clean'
 			inheritAll='false'/>
 	</target>
-	<target name='depend-clean.util'>
-		<ant dir='${depend.root}/util' target='clean'
-			inheritAll='false'/>
-	</target>
 </project>