Changes aggregated at redwerk

.hgignore

@@ -0,0 +1,7 @@
+build
+shared/bin
+uploader/bin
+lib/snakeyaml-1.5.jar
+dist/Library.jar
+dist/uploader.jar
+shared/TermEntryTest/test.yml

README

@@ -4,6 +4,7 @@ Build:
 
   plugin-Library$ ant
 
+
 == Javadoc ==
 
 If you want to generate Javadocs, download bliki-doclet, which is a little
@@ -56,3 +57,9 @@ this may change soon :
 <input type="submit" />
 </form>
 
+
+== Ongoing work to split ==
+
+The plugin is in src, test (for historical reasons).
+
+The uploader (standalone program) is in uploader/src and uploader/test depending on fcp and plugin.

README.clean-build

@@ -1 +1,2 @@
-Library depends on SnakeYAML. It will fetch it from a known URL with a known version and checksums by default. If you want a completely clean build, fetch it yourself and build it yourself, and put it in lib/SnakeYAML-1.3.jar.
+Library depends on SnakeYAML. It will fetch it from a known URL with a known version and checksums by default.
+If you want a completely clean build, fetch it yourself and build it yourself, and put it in lib/SnakeYAML-1.3.jar.

build.xml

@@ -2,10 +2,10 @@
 <!-- ant build file for Freenet -->
 
 <project name="plugins-Library" default="dist" basedir=".">
-	<property name="freenet-cvs-snapshot.location" location="../fred/dist/freenet.jar"/>
+	<property name="freenet-cvs-snapshot.location" location="../fred/build/libs/freenet.jar"/>
 	<property name="freenet-ext.location" location="../fred/lib/freenet/freenet-ext.jar"/>
-	<property name="source-version" value="1.6"/>
-	<property name="target-version" value="1.6"/>
+	<property name="source-version" value="1.8"/>
+	<property name="target-version" value="1.8"/>
 	<property name="build" location="build/"/>
 	<property name="build-test" location="build-test/"/>
 	<property name="run-test" location="run-test/"/>
@@ -64,14 +64,14 @@
 		<delete dir="${tmp}"/>
 	</target>
 
-	<property name="SnakeYAML.mirror" value="https://downloads.freenetproject.org/snakeyaml-1.5.jar" />
-	<property name="SnakeYAML.md5" value="1788db5d529a981b090632b8e49b8cd2" />
-	<property name="SnakeYAML.sha" value="a3654035d0b68db775034afa5425a62250de8184" />
+	<property name="SnakeYAML.mirror" value="https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.25/snakeyaml-1.25.jar" />
+	<property name="SnakeYAML.md5" value="6f7d5b8f596047aae07a3bf6f23a0bf2" />
+	<property name="SnakeYAML.sha" value="8b6e01ef661d8378ae6dd7b511a7f2a33fae1421" />
 	<available property="SnakeYAML.exist" classname="org.yaml.snakeyaml.Yaml" classpathref="lib.path"/>
 	<target name="SnakeYAML-get" unless="SnakeYAML.exist">
-		<get verbose="true" src="${SnakeYAML.mirror}" dest="${tmp}/snakeyaml-1.5.jar" />
-		<checksum file="${tmp}/snakeyaml-1.5.jar" algorithm="MD5" property="${SnakeYAML.md5}" verifyProperty="SnakeYAMLMD5ok" />
-		<checksum file="${tmp}/snakeyaml-1.5.jar" algorithm="SHA" property="${SnakeYAML.sha}" verifyProperty="SnakeYAMLSHAok" />
+		<get verbose="true" src="${SnakeYAML.mirror}" dest="${tmp}/snakeyaml-1.25.jar" />
+		<checksum file="${tmp}/snakeyaml-1.25.jar" algorithm="MD5" property="${SnakeYAML.md5}" verifyProperty="SnakeYAMLMD5ok" />
+		<checksum file="${tmp}/snakeyaml-1.25.jar" algorithm="SHA" property="${SnakeYAML.sha}" verifyProperty="SnakeYAMLSHAok" />
 		<fail message="SnakeYAML.zip checksum mismatch">
 			<condition>
 				<or>
@@ -80,7 +80,7 @@
 				</or>
 			</condition>
 		</fail>
-		<move file="${tmp}/snakeyaml-1.5.jar" todir="lib/" />
+		<move file="${tmp}/snakeyaml-1.25.jar" todir="lib/" />
 	</target>
 
 	<!--<property name="KeyExplorer.mirror" value="http://cloud.github.com/downloads/freenet/plugin-Library-staging/KeyExplorer-dacfafecbc82aecdeffa56bef4a047a7f6c7f08d.jar" />
@@ -131,7 +131,7 @@
 		</javac>
 
 		<!-- Force compile of Version.java in case compile of ${src} didn't trigger it -->
-		<javac srcdir="${build}" destdir="${build}" debug="on" optimize="on" source="1.5" target="1.5">
+		<javac srcdir="${build}" destdir="${build}" debug="on" optimize="on" source="1.8" target="1.8">
 			<classpath>
 				<path refid="lib.path"/>
 			</classpath>
@@ -146,7 +146,7 @@
 	</target>
 
 	<target name="compile-tester" depends="compile" if="tester">
-		<javac srcdir="test/" destdir="${build}" debug="on" optimize="on" source="1.5" target="1.5">
+		<javac srcdir="test/" destdir="${build}" debug="on" optimize="on" source="1.8" target="1.8">
 			<classpath>
 				<path refid="lib.path"/>
 				<!-- Uses some code that uses junit -->
@@ -173,7 +173,7 @@
 
 	<!-- ================================================== -->
 	<target name="unit-build" depends="compile" if="junit.present" unless="skip_tests">
-		<javac srcdir="test/" destdir="${build-test}" debug="on" optimize="on" source="1.5">
+		<javac srcdir="test/" destdir="${build-test}" debug="on" optimize="on" source="1.8">
 			<classpath>
 				<path refid="lib.path"/>
 				<pathelement path="${build}"/>

loop.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -x
+
+while test -f library.continue.loop
+do
+    java -jar `dirname $0`/dist/uploader.jar
+    sleep 60
+done

src/plugins/Library/ArchiverFactory.java

@@ -0,0 +1,18 @@
+package plugins.Library;
+
+import plugins.Library.io.ObjectStreamReader;
+import plugins.Library.io.ObjectStreamWriter;
+import plugins.Library.io.serial.LiveArchiver;
+import plugins.Library.util.exec.SimpleProgress;
+
+public interface ArchiverFactory {
+    <T, S extends ObjectStreamWriter & ObjectStreamReader>
+		  LiveArchiver<T, SimpleProgress>
+		  newArchiver(S rw, String mime, int size,
+                      Priority priorityLevel);
+
+    <T, S extends ObjectStreamWriter & ObjectStreamReader>
+		  LiveArchiver<T, SimpleProgress>
+		  newArchiver(S rw, String mime, int size,
+                      LiveArchiver<T, SimpleProgress> archiver);
+}

src/plugins/Library/FactoryRegister.java

@@ -0,0 +1,14 @@
+package plugins.Library;
+
+public class FactoryRegister {
+	private static ArchiverFactory archiver = null;
+
+	public static void register(ArchiverFactory factory) {
+		archiver = factory;
+	}
+
+	public static ArchiverFactory getArchiverFactory() {
+		assert archiver != null;
+		return archiver;
+	}
+}