[ff-cvs] fenfire ./Makefile docs/pegboard/cvs_to_tla--tj...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/28 10:23:19

Modified files:
        .              : Makefile 
        docs/pegboard/cvs_to_tla--tjl: peg.rst 
        org/fenfire/spanimages/gl: CachingSpanImageFactory.java 

Log message:
        Twids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/CachingSpanImageFactory.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.43 fenfire/Makefile:1.44
--- fenfire/Makefile:1.43       Thu Aug 28 09:38:17 2003
+++ fenfire/Makefile    Thu Aug 28 10:23:18 2003
@@ -18,7 +18,7 @@
 
 
PYTHONPATH=-Dpython.path=../fenfire-depends/jythonlib.jar:../fenfire-depends/jython.jar:../fenfire-depends/pythonlib.jar:.:../libvob:../alph
 
 
-JAVA ?= java
+JAVA ?= java -Xincgc
 
 java:
        mkdir -p build
@@ -47,7 +47,7 @@
        $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/rundemo.py -Dfenpdf.file=$(FILE) $(DBG) org/fenfire/bin/$(BIN)
 
 run_literature:
-       $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/rundemo.py -Dfenpdf.pool=../fenfire-priv/ 
-Dfenpdf.file=../spaces/literature.rdf -Dvob.windowsize=$(WINDOWSIZE) $(DBG) 
org/fenfire/bin/$(BIN)
+       $(LDLIB) $(JAVA) -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/rundemo.py -Dfenpdf.pool=../fenfire-priv/ 
-Dfenpdf.file=../spaces/literature.rdf -Dvob.windowsize=$(WINDOWSIZE) $(DBG) 
org/fenfire/bin/$(BIN)
 
 run_fenpdfdemo:
        $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/rundemo.py -Dfenpdf.file=$(FILE) -Dfenpdf.demo=1 $(DBG) 
org/fenfire/bin/$(BIN)
Index: fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst
diff -u fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst:1.1 
fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst:1.2
--- fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst:1.1   Tue Aug 26 07:40:20 2003
+++ fenfire/docs/pegboard/cvs_to_tla--tjl/peg.rst       Thu Aug 28 10:23:18 2003
@@ -3,8 +3,8 @@
 =============================================================
 
 :Author:   Tuomas J. Lukka
-:Last-Modified: $Date: 2003/08/26 11:40:20 $
-:Revision: $Revision: 1.1 $
+:Last-Modified: $Date: 2003/08/28 14:23:18 $
+:Revision: $Revision: 1.2 $
 :Status:   Incomplete
 
 Having the FenPDF prototype in production use requires more
@@ -12,11 +12,35 @@
 branching and inspection of commits *before* allowing
 them into the official tree.
 
-I propose we move to arch, the moment version 1.1 (with star-merge)
-is finished.
+I propose we move to arch, at the latest
+the moment version 1.1 (with star-merge)
+is finished, and start testing the 1.1 pre versions
+right away.
 
 Issues
 ======
 
 Changes
 =======
+
+The fenfire projects will be moved out of CVS and into arch.
+The projects will be named ::
+
+    glmosaictext
+    alph
+    alph-depends
+    callgl
+    controllers
+    fenfire
+    fenfire-cvs
+    fenfire-depends
+    fenfire-priv
+    libvob
+    libvob-depends
+    loom
+    manuscripts
+    navidoc
+    navidoc-depends
+    spaces
+    storm
+    storm-depends
Index: fenfire/org/fenfire/spanimages/gl/CachingSpanImageFactory.java
diff -u fenfire/org/fenfire/spanimages/gl/CachingSpanImageFactory.java:1.3 
fenfire/org/fenfire/spanimages/gl/CachingSpanImageFactory.java:1.4
--- fenfire/org/fenfire/spanimages/gl/CachingSpanImageFactory.java:1.3  Tue Aug 
26 14:50:47 2003
+++ fenfire/org/fenfire/spanimages/gl/CachingSpanImageFactory.java      Thu Aug 
28 10:23:19 2003
@@ -36,8 +36,11 @@
  */
 
 public class CachingSpanImageFactory extends SpanImageFactory {
+
     private Map cache = Collections.synchronizedMap(
-                   new SoftValueMap());
+                   new CachingMap(1000));
+//                 new SoftValueMap());
+
     public SpanImageFactory factory;
     CacheControl.Listener listener;