updates

diff --git a/doc/TODO.txt b/doc/TODO.txt
index b60a889..a1d7a51 100755 (executable)
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -1,4 +1,4 @@
-[Updated $Date: 2002/07/03 12:18:19 $]
+[Updated $Date: 2002/07/08 00:26:33 $]
 
 General/Forever valid:
 
@@ -12,7 +12,7 @@ Version 1.0:
 Bugfixes/Improvements: 
 a) installation-procedure 
 - templates-directory should be splittet in two directories: "internal"- (openmir and mir templates) and "external"-templates (producer-templates) 
-- build.sh should be more intelligent. (underway, convert to build.xml, mj)
+- build.sh should be more intelligent. (done, convert to build.xml, mj)
 b) code-cleaning 
 - the variable-names for the freemarker should be better: the same name for the same thing
 c) We have to make sure that all errors are handled intelligently. e.g. if an 
@@ -25,7 +25,7 @@ g) new layout Mir/OpenMir (underway, indy de team??)
 i) mission-statement and licensing 
 j) there are no memory-leaks (done)
 k) tomcat 4.x (done, confirmed, -idfx)
-l) poolman (done, idfx)
+l) poolman (done, idfx) (although poolman now needs to be replaced too.)
 m) re-tweak media infrastructure (underway, -mh)
     - wildcard support for content-type mappings (done)
     - handle all image types and transparency (done)
@@ -33,6 +33,7 @@ m) re-tweak media infrastructure (underway, -mh)
     - handle generic media (underway, mh)
         - better extension handling
     - handle external meta links
+    - media size handling nicely (underway, mh)
     - rework creation of audio (video too?) meta-data (done, mh)
         - make getUrl() return a SimpleList (done, mh)
     - use added flexibility in templates (done, mh)
@@ -40,7 +41,7 @@ n) CVS id, author stamps (underway)
 o) make Entity implement freemarker TemplateModel (done, rk)
 p) don't use deprecated methods. specifically the SimpleList stuff (done, mh, rk)
 q) Admin interface for some media handlers needs to be improved
-r) Streaming IO for media files
+r) Streaming IO for media files + merge upload handling on admin/open (underway, mh)
 
 
 New Features: