Author: nextgens
Date: 2006-11-10 20:30:08 +0000 (Fri, 10 Nov 2006)
New Revision: 10868
Added:
trunk/contrib/fec/lib/
trunk/contrib/fec/onion_LICENSE
Removed:
trunk/contrib/fec/common/ChangeLog
trunk/contrib/fec/fec_src/com/onionnetworks/fec/io/
trunk/contrib/lib/
trunk/contrib/onion_LICENSE
Modified:
trunk/contrib/freenet_ext/build.xml
Log:
Contrib: FEC stuffs again
* remove the Changelog as we are not going to maintain it
* fix the build process (it's still ugly but it works)
Deleted: trunk/contrib/fec/common/ChangeLog
===================================================================
--- trunk/contrib/fec/common/ChangeLog 2006-11-10 20:10:52 UTC (rev 10867)
+++ trunk/contrib/fec/common/ChangeLog 2006-11-10 20:30:08 UTC (rev 10868)
@@ -1,58 +0,0 @@
-9/26/2002:
-
-o AsyncPersistentProps properly throws Exceptions.
-o safeOnionFile now ensures file existance.
-
-5/29/2002:
-
-o JoiningInputStream added
-
-5/08/2002:
-
-o LazyRenameRAF refactored out of ScratchRAF
-o BlockingRAF is now a FilterRAF
-
-5/07/2002:
-
-o FilterRAF created
-o RAF.getFile() added
-o Journal created
-o JournalingRAF created
-o getUserTempDir and createTempFile moved to FileUtil from ScratchRAF
-
-5/03/2002:
-
-o contains(Range) added to RangeSet
-
-4/28/2002:
-
-o BlockingRAF now supports look-aside buffers. Thus, increasing the size
-of the buffers passed into a WebRAID InputStream can significantly decrease
-the amount of IO that takes place while streaming.
-
-o ReflectiveEventDispatch CPU utilization has been improved significantly.
-
-3/12/2002:
-
-Added RAF.length()
-Optimized RAFInputStream.skip()
-
-bourbon-14:
-
-o clear() added to AsyncPersistentProps
-o Fixed RangeSet AIOOB when RangeSet is empty.
-
-bourbon-12:
-
-o Check for min > max in RangeSet.add added.
-o ReflectiveEventDispatcher now uses ExceptionHandler.
-
-bourbon-11:
-
-o ExceptionHandler interface added.
-
-bourbon-6:
-
-o NativeDeployer now threadsafe
-o Revamped NativeDeployer properties format.
-
Copied: trunk/contrib/fec/lib (from rev 10866, trunk/contrib/lib)
Copied: trunk/contrib/fec/onion_LICENSE (from rev 10866,
trunk/contrib/onion_LICENSE)
Modified: trunk/contrib/freenet_ext/build.xml
===================================================================
--- trunk/contrib/freenet_ext/build.xml 2006-11-10 20:10:52 UTC (rev 10867)
+++ trunk/contrib/freenet_ext/build.xml 2006-11-10 20:30:08 UTC (rev 10868)
@@ -20,17 +20,23 @@
</javac>
</target>
- <target name="fec" depends="init" description="build the
FECEncoder/Decoder plugins for fproxy.">
+ <target name="fec-common" depends="init" description="build required
classes for FEC">
+ <ant antfile="build.xml" dir="../fec/common/"/>
+ </target>
+
+ <target name="fec" depends="fec-common" description="build the
fecencoder/decoder plugins for fproxy.">
<javac destdir="${build}">
<src path="../fec/fec_src"/>
- <classpath path="../onion-common.jar"/>
+ <classpath path="../fec/common/lib/onion-common.jar"/>
+ <classpath path="../junit"/>
</javac>
- <copy file="../onion_LICENSE" todir="${build}"/>
+
+ <copy file="../fec/onion_LICENSE" todir="${build}"/>
<copy todir="${build}">
- <fileset dir="../fec_src">
+ <fileset dir="../fec/fec_src">
<include name="**/*.properties"/>
</fileset>
- <fileset dir="../">
+ <fileset dir="../fec/">
<include name="lib/"/>
</fileset>
</copy>
@@ -51,13 +57,14 @@
<target name="clean" depends="distclean"/>
<target name="distclean" description="Delete the build directory and
archives">
+ <ant antfile="build.xml" target="clean" dir="../fec/common/"/>
<delete dir="${build}"/>
<delete file="${jar.location}"/>
</target>
<target name="jar" depends="clean,fec,jcpuid,bigint"
description="Create a .jar">
<jar jarfile="${jar.location}" basedir="${build}" includes="**">
- <zipfileset src="../onion-common.jar"/>
+ <zipfileset src="../fec/common/lib/onion-common.jar"/>
<zipfileset src="../je.jar"/>
<zipfileset src="../wrapper.jar"/>
</jar>
Deleted: trunk/contrib/onion_LICENSE
===================================================================
--- trunk/contrib/onion_LICENSE 2006-11-10 20:10:52 UTC (rev 10867)
+++ trunk/contrib/onion_LICENSE 2006-11-10 20:30:08 UTC (rev 10868)
@@ -1,39 +0,0 @@
-/*
- * Java Forward Error Correction Library
- * Copyright (C) 2001 Onion Networks
- * Copyright (C) 2000 OpenCola
- *
- * Portions derived from code by Luigi Rizzo:
- * fec.c -- forward error correction based on Vandermonde matrices
- * 980624
- * (C) 1997-98 Luigi Rizzo (luigi at iet.unipi.it)
- *
- * Portions derived from code by Phil Karn (karn at ka9q.ampr.org),
- * Robert Morelos-Zaragoza (robert at spectra.eng.hawaii.edu) and Hari
- * Thirumoorthy (harit at spectra.eng.hawaii.edu), Aug 1995
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */
-
